Module Name: src Committed By: sjg Date: Fri Sep 2 18:54:25 UTC 2022
Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile Log Message: Enable make/unit-tests/directive-for-break Also ensure MAKE_VERSION is ignored. To generate a diff of this commit: cvs rdiff -u -r1.1220 -r1.1221 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.322 -r1.323 src/usr.bin/make/unit-tests/Makefile 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.1220 src/distrib/sets/lists/tests/mi:1.1221 --- src/distrib/sets/lists/tests/mi:1.1220 Sat Aug 27 08:31:58 2022 +++ src/distrib/sets/lists/tests/mi Fri Sep 2 18:54:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1220 2022/08/27 08:31:58 christos Exp $ +# $NetBSD: mi,v 1.1221 2022/09/02 18:54:25 sjg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5634,6 +5634,8 @@ ./usr/tests/usr.bin/make/unit-tests/directive-export-literal.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/directive-export.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/directive-export.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/directive-for-break.exp tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/directive-for-break.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/directive-for-empty.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/directive-for-empty.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/directive-for-errors.exp tests-usr.bin-tests compattestfile,atf @@ -5740,6 +5742,7 @@ ./usr/tests/usr.bin/make/unit-tests/jobs-error-nested.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/lint.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/lint.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/local.init.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/make-exported.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/make-exported.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/meta-cmd-cmp.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.322 src/usr.bin/make/unit-tests/Makefile:1.323 --- src/usr.bin/make/unit-tests/Makefile:1.322 Fri Sep 2 16:24:31 2022 +++ src/usr.bin/make/unit-tests/Makefile Fri Sep 2 18:54:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.322 2022/09/02 16:24:31 sjg Exp $ +# $NetBSD: Makefile,v 1.323 2022/09/02 18:54:25 sjg Exp $ # # Unit tests for make(1) # @@ -168,7 +168,7 @@ TESTS+= directive-export-impl TESTS+= directive-export-gmake TESTS+= directive-export-literal TESTS+= directive-for -#TESTS+= directive-for-break +TESTS+= directive-for-break TESTS+= directive-for-empty TESTS+= directive-for-errors TESTS+= directive-for-escape @@ -721,6 +721,7 @@ _SED_CMDS+= -e 's,${.OBJDIR},<curdir>,g' _SED_CMDS+= -e 's,${.CURDIR},<curdir>,g' _SED_CMDS+= -e 's,<curdir>/,,g' _SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g' +_SED_CMDS+= -e '/MAKE_VERSION/d' .rawout.out: @${TOOL_SED} ${_SED_CMDS} ${SED_CMDS.${.PREFIX:T}} \