Module Name: src Committed By: rillig Date: Tue Nov 24 15:36:51 UTC 2020
Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile Added Files: src/usr.bin/make/unit-tests: deptgt-end-fail.exp deptgt-end-fail.mk Log Message: make(1): add test for missing "Stop" after error in .END To generate a diff of this commit: cvs rdiff -u -r1.975 -r1.976 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.221 -r1.222 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/deptgt-end-fail.exp \ src/usr.bin/make/unit-tests/deptgt-end-fail.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.975 src/distrib/sets/lists/tests/mi:1.976 --- src/distrib/sets/lists/tests/mi:1.975 Mon Nov 23 15:00:32 2020 +++ src/distrib/sets/lists/tests/mi Tue Nov 24 15:36:51 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.975 2020/11/23 15:00:32 rillig Exp $ +# $NetBSD: mi,v 1.976 2020/11/24 15:36:51 rillig Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4961,6 +4961,8 @@ ./usr/tests/usr.bin/make/unit-tests/deptgt-default.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/deptgt-delete_on_error.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/deptgt-delete_on_error.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/deptgt-end-fail.exp tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/deptgt-end-fail.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/deptgt-end-jobs.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/deptgt-end-jobs.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/deptgt-end.exp tests-usr.bin-tests compattestfile,atf Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.221 src/usr.bin/make/unit-tests/Makefile:1.222 --- src/usr.bin/make/unit-tests/Makefile:1.221 Mon Nov 23 16:01:59 2020 +++ src/usr.bin/make/unit-tests/Makefile Tue Nov 24 15:36:51 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.221 2020/11/23 16:01:59 rillig Exp $ +# $NetBSD: Makefile,v 1.222 2020/11/24 15:36:51 rillig Exp $ # # Unit tests for make(1) # @@ -112,6 +112,7 @@ TESTS+= deptgt-begin TESTS+= deptgt-default TESTS+= deptgt-delete_on_error TESTS+= deptgt-end +TESTS+= deptgt-end-fail TESTS+= deptgt-end-jobs TESTS+= deptgt-error TESTS+= deptgt-ignore Added files: Index: src/usr.bin/make/unit-tests/deptgt-end-fail.exp diff -u /dev/null src/usr.bin/make/unit-tests/deptgt-end-fail.exp:1.1 --- /dev/null Tue Nov 24 15:36:51 2020 +++ src/usr.bin/make/unit-tests/deptgt-end-fail.exp Tue Nov 24 15:36:51 2020 @@ -0,0 +1,4 @@ +: all +false +*** Error code 1 (continuing) +exit status 0 Index: src/usr.bin/make/unit-tests/deptgt-end-fail.mk diff -u /dev/null src/usr.bin/make/unit-tests/deptgt-end-fail.mk:1.1 --- /dev/null Tue Nov 24 15:36:51 2020 +++ src/usr.bin/make/unit-tests/deptgt-end-fail.mk Tue Nov 24 15:36:51 2020 @@ -0,0 +1,13 @@ +# $NetBSD: deptgt-end-fail.mk,v 1.1 2020/11/24 15:36:51 rillig Exp $ +# +# Tests for an error in the .END node. +# +# Before 2020-11-25, an error in the .END target did not print the "Stop.", +# even though this was intended. The cause for this was a simple typo in +# a variable name. + +all: + : $@ + +.END: + false