Author: jmmv
Date: Wed Mar 19 12:29:20 2014
New Revision: 263346
URL: http://svnweb.freebsd.org/changeset/base/263346
Log:
Migrate tools/regression/usr.bin/make/ to the new tests layout.
Note that these tests are for fmake, not bmake, and thus they are not
installed nor run when bmake is selected (the default). Yes, I have
wasted a *ton* of time on moving tests for no real reason other than
ensuring they are not left behind.
But maybe, just maybe, it was not work in vain: the majority of these
tests also work with bmake and the few that don't may point at broken
stuff. For example, the tests for the "archive" feature do not work
with bmake, but bmake's manpage and source tree seem to imply that they
should. So... to be investigated later; need to poke sjg@.
Added:
head/usr.bin/make/tests/
- copied from r263227, head/tools/regression/usr.bin/make/
head/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
head/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
head/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
head/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
head/usr.bin/make/tests/basic/t0/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/basic/t0/test.t
head/usr.bin/make/tests/basic/t1/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/basic/t1/Makefile
head/usr.bin/make/tests/basic/t1/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/basic/t1/test.t
head/usr.bin/make/tests/basic/t2/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/basic/t2/Makefile
head/usr.bin/make/tests/basic/t2/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/basic/t2/test.t
head/usr.bin/make/tests/basic/t3/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/basic/t3/test.t
head/usr.bin/make/tests/execution/ellipsis/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/execution/ellipsis/Makefile
head/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/execution/ellipsis/test.t
head/usr.bin/make/tests/execution/empty/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/execution/empty/Makefile
head/usr.bin/make/tests/execution/empty/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/execution/empty/test.t
head/usr.bin/make/tests/execution/joberr/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/execution/joberr/Makefile
head/usr.bin/make/tests/execution/joberr/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/execution/joberr/test.t
head/usr.bin/make/tests/execution/plus/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/execution/plus/Makefile
head/usr.bin/make/tests/execution/plus/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/execution/plus/test.t
head/usr.bin/make/tests/shell/builtin/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/shell/builtin/Makefile
head/usr.bin/make/tests/shell/builtin/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/builtin/test.t
head/usr.bin/make/tests/shell/meta/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/shell/meta/Makefile
head/usr.bin/make/tests/shell/meta/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/meta/test.t
head/usr.bin/make/tests/shell/path/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/shell/path/Makefile
head/usr.bin/make/tests/shell/path/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/path/test.t
head/usr.bin/make/tests/shell/path_select/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/shell/path_select/Makefile
head/usr.bin/make/tests/shell/path_select/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/path_select/test.t
head/usr.bin/make/tests/shell/replace/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/shell/replace/Makefile
head/usr.bin/make/tests/shell/replace/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/replace/test.t
head/usr.bin/make/tests/shell/select/Makefile.test
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/select/Makefile
head/usr.bin/make/tests/shell/select/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/shell/select/test.t
head/usr.bin/make/tests/suffixes/basic/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/suffixes/basic/Makefile
head/usr.bin/make/tests/suffixes/basic/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/suffixes/basic/test.t
head/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
head/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
head/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
head/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
head/usr.bin/make/tests/syntax/directive-t0/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/syntax/directive-t0/Makefile
head/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/syntax/directive-t0/test.t
head/usr.bin/make/tests/syntax/enl/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/syntax/enl/Makefile
head/usr.bin/make/tests/syntax/enl/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/syntax/enl/test.t
head/usr.bin/make/tests/syntax/funny-targets/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/syntax/funny-targets/Makefile
head/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/syntax/funny-targets/test.t
head/usr.bin/make/tests/syntax/semi/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/syntax/semi/Makefile
head/usr.bin/make/tests/syntax/semi/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/syntax/semi/test.t
head/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile
head/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t
head/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk
head/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t
head/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk
head/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t
head/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk
head/usr.bin/make/tests/variables/modifier_M/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/variables/modifier_M/Makefile
head/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/variables/modifier_M/test.t
head/usr.bin/make/tests/variables/modifier_t/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/variables/modifier_t/Makefile
head/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/variables/modifier_t/test.t
head/usr.bin/make/tests/variables/opt_V/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/variables/opt_V/Makefile
head/usr.bin/make/tests/variables/opt_V/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/variables/opt_V/test.t
head/usr.bin/make/tests/variables/t0/Makefile.test
- copied unchanged from r263227,
head/tools/regression/usr.bin/make/variables/t0/Makefile
head/usr.bin/make/tests/variables/t0/legacy_test.sh
- copied, changed from r263227,
head/tools/regression/usr.bin/make/variables/t0/test.t
Deleted:
head/tools/regression/usr.bin/make/
head/usr.bin/make/tests/all.sh
head/usr.bin/make/tests/archives/fmt_44bsd/Makefile
head/usr.bin/make/tests/archives/fmt_44bsd/test.t
head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
head/usr.bin/make/tests/archives/fmt_44bsd_mod/test.t
head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
head/usr.bin/make/tests/archives/fmt_oldbsd/test.t
head/usr.bin/make/tests/basic/t0/test.t
head/usr.bin/make/tests/basic/t1/Makefile
head/usr.bin/make/tests/basic/t1/test.t
head/usr.bin/make/tests/basic/t2/Makefile
head/usr.bin/make/tests/basic/t2/test.t
head/usr.bin/make/tests/basic/t3/test.t
head/usr.bin/make/tests/execution/ellipsis/Makefile
head/usr.bin/make/tests/execution/ellipsis/test.t
head/usr.bin/make/tests/execution/empty/Makefile
head/usr.bin/make/tests/execution/empty/test.t
head/usr.bin/make/tests/execution/joberr/Makefile
head/usr.bin/make/tests/execution/joberr/test.t
head/usr.bin/make/tests/execution/plus/Makefile
head/usr.bin/make/tests/execution/plus/test.t
head/usr.bin/make/tests/shell/builtin/Makefile
head/usr.bin/make/tests/shell/builtin/test.t
head/usr.bin/make/tests/shell/meta/Makefile
head/usr.bin/make/tests/shell/meta/test.t
head/usr.bin/make/tests/shell/path/Makefile
head/usr.bin/make/tests/shell/path/test.t
head/usr.bin/make/tests/shell/path_select/Makefile
head/usr.bin/make/tests/shell/path_select/test.t
head/usr.bin/make/tests/shell/replace/Makefile
head/usr.bin/make/tests/shell/replace/test.t
head/usr.bin/make/tests/shell/select/Makefile
head/usr.bin/make/tests/shell/select/test.t
head/usr.bin/make/tests/suffixes/basic/Makefile
head/usr.bin/make/tests/suffixes/basic/test.t
head/usr.bin/make/tests/suffixes/src_wild1/Makefile
head/usr.bin/make/tests/suffixes/src_wild1/test.t
head/usr.bin/make/tests/suffixes/src_wild2/Makefile
head/usr.bin/make/tests/suffixes/src_wild2/test.t
head/usr.bin/make/tests/syntax/directive-t0/Makefile
head/usr.bin/make/tests/syntax/directive-t0/test.t
head/usr.bin/make/tests/syntax/enl/Makefile
head/usr.bin/make/tests/syntax/enl/test.t
head/usr.bin/make/tests/syntax/funny-targets/Makefile
head/usr.bin/make/tests/syntax/funny-targets/test.t
head/usr.bin/make/tests/syntax/semi/Makefile
head/usr.bin/make/tests/syntax/semi/test.t
head/usr.bin/make/tests/sysmk/t0/2/1/Makefile
head/usr.bin/make/tests/sysmk/t0/2/1/test.t
head/usr.bin/make/tests/sysmk/t0/mk/sys.mk
head/usr.bin/make/tests/sysmk/t1/2/1/test.t
head/usr.bin/make/tests/sysmk/t1/mk/sys.mk
head/usr.bin/make/tests/sysmk/t2/2/1/test.t
head/usr.bin/make/tests/sysmk/t2/mk/sys.mk
head/usr.bin/make/tests/variables/modifier_M/Makefile
head/usr.bin/make/tests/variables/modifier_M/test.t
head/usr.bin/make/tests/variables/modifier_t/Makefile
head/usr.bin/make/tests/variables/modifier_t/test.t
head/usr.bin/make/tests/variables/opt_V/Makefile
head/usr.bin/make/tests/variables/opt_V/test.t
head/usr.bin/make/tests/variables/t0/Makefile
head/usr.bin/make/tests/variables/t0/test.t
Modified:
head/etc/mtree/BSD.tests.dist
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/make/Makefile
head/usr.bin/make/tests/README
head/usr.bin/make/tests/common.sh
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Wed Mar 19 12:06:51 2014
(r263345)
+++ head/etc/mtree/BSD.tests.dist Wed Mar 19 12:29:20 2014
(r263346)
@@ -111,6 +111,104 @@
..
m4
..
+ make
+ archives
+ fmt_44bsd
+ ..
+ fmt_44bsd_mod
+ ..
+ fmt_oldbsd
+ ..
+ ..
+ basic
+ t0
+ ..
+ t1
+ ..
+ t2
+ ..
+ t3
+ ..
+ ..
+ execution
+ ellipsis
+ ..
+ empty
+ ..
+ joberr
+ ..
+ plus
+ ..
+ ..
+ shell
+ builtin
+ ..
+ meta
+ ..
+ path
+ ..
+ path_select
+ ..
+ replace
+ ..
+ select
+ ..
+ ..
+ suffixes
+ basic
+ ..
+ src_wild1
+ ..
+ src_wild2
+ ..
+ ..
+ syntax
+ directive-t0
+ ..
+ enl
+ ..
+ funny-targets
+ ..
+ semi
+ ..
+ ..
+ sysmk
+ t0
+ 2
+ 1
+ ..
+ ..
+ mk
+ ..
+ ..
+ t1
+ 2
+ 1
+ ..
+ ..
+ mk
+ ..
+ ..
+ t2
+ 2
+ 1
+ ..
+ ..
+ mk
+ ..
+ ..
+ ..
+ variables
+ modifier_M
+ ..
+ modifier_t
+ ..
+ opt_V
+ ..
+ t0
+ ..
+ ..
+ ..
ncal
..
printf
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Mar 19 12:06:51
2014 (r263345)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Mar 19 12:29:20
2014 (r263346)
@@ -4129,6 +4129,376 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/pr
OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
+.if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/common.sh
+OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
+OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
+OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
+OLD_DIRS+=usr/tests/usr.bin/make/variables
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
+OLD_DIRS+=usr/tests/usr.bin/make/syntax
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes
+OLD_DIRS+=usr/tests/usr.bin/make/shell/select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path
+OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
+OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
+OLD_DIRS+=usr/tests/usr.bin/make/shell
+OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
+OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
+OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
+OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
+OLD_DIRS+=usr/tests/usr.bin/make/execution
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
+OLD_DIRS+=usr/tests/usr.bin/make/basic
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives
+OLD_DIRS+=usr/tests/usr.bin/make
+.endif
.else
# ATF libraries.
OLD_FILES+=usr/bin/atf-sh
Modified: head/usr.bin/make/Makefile
==============================================================================
--- head/usr.bin/make/Makefile Wed Mar 19 12:06:51 2014 (r263345)
+++ head/usr.bin/make/Makefile Wed Mar 19 12:29:20 2014 (r263346)
@@ -118,4 +118,8 @@ fmake.1: make.1
cp ${.ALLSRC} ${.TARGET}
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: head/usr.bin/make/tests/README
==============================================================================
--- head/tools/regression/usr.bin/make/README Sun Mar 16 08:04:06 2014
(r263227)
+++ head/usr.bin/make/tests/README Wed Mar 19 12:29:20 2014
(r263346)
@@ -2,9 +2,7 @@ $FreeBSD$
This directory contains regression tests for make(1).
-To invoke the tests install prove(1) from ports/devel/p5-Test-Harness and
-run 'prove -r'. Alternatively one can use 'sh ./all.sh test' and scan the
-output for '^not ok'.
+To invoke the tests, please refer to tests(7).
----------------------------------------------------------------------------
Copied: head/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test (from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test Wed Mar 19
12:29:20 2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile)
@@ -0,0 +1,61 @@
+# $FreeBSD$
+# This test checks the code reading archive files. The archive file
+# is a BSD4.4 file with __.SYMTAB and #1/N long file names.
+
+#############################################################################
+
+# should be ok
+test1: libtest.a(short.o)
+ @:
+
+libtest.a(short.o): ood
+ @:
+
+#############################################################################
+
+# should be ok
+test2: libtest.a(exactly15char.o)
+ @:
+
+libtest.a(exactly15char.o): ood
+ @:
+
+#############################################################################
+
+# should be ok
+test3: libtest.a(exactly16chars.o)
+ @:
+
+libtest.a(exactly16chars.o): ood
+ @:
+
+#############################################################################
+
+# should be ok
+test4: libtest.a(verylongobjectname.o)
+ @:
+
+libtest.a(verylongobjectname.o): ood
+ @:
+
+#############################################################################
+
+# Truncated to 16 characters
+# should fail
+test5: libtest.a(verylongobjectna)
+ @:
+
+#############################################################################
+
+# Truncated to 15 characters
+# should fail
+test6: libtest.a(verylongobjectn)
+ @:
+
+#############################################################################
+
+# should fail
+test7: libtest.a(\#1/20)
+ @:
+
+ood:
Copied and modified: head/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
(from r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t Sun Mar
16 08:04:06 2014 (r263227, copy source)
+++ head/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh Wed Mar 19
12:29:20 2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="Archive parsing (BSD4.4 format)."
Copied: head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test (from
r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test Wed Mar
19 12:29:20 2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile)
@@ -0,0 +1,64 @@
+# $FreeBSD$
+# This test checks the code reading archive files. The archive file
+# is a BSD4.4 file with __.SYMTAB and #1/N long file names.
+#
+# The modification of the archive consists in slashes appended to short names.
+#
+
+#############################################################################
+
+# must be ok
+test1: libtest.a(short.o)
+ @:
+
+libtest.a(short.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test2: libtest.a(exactly15char.o)
+ @:
+
+libtest.a(exactly15char.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test3: libtest.a(exactly16chars.o)
+ @:
+
+libtest.a(exactly16chars.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test4: libtest.a(verylongobjectname.o)
+ @:
+
+libtest.a(verylongobjectname.o): ood
+ @:
+
+#############################################################################
+
+# Truncated to 16 characters
+# must fail
+test5: libtest.a(verylongobjectna)
+ @:
+
+#############################################################################
+
+# Truncated to 15 characters
+# must fail
+test6: libtest.a(verylongobjectn)
+ @:
+
+#############################################################################
+
+# must fail
+test7: libtest.a(\#1/20)
+ @:
+
+ood:
Copied and modified:
head/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh (from r263227,
head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t Sun Mar
16 08:04:06 2014 (r263227, copy source)
+++ head/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh Wed Mar
19 12:29:20 2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="Archive parsing (modified BSD4.4 format)."
Copied: head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test (from
r263227, head/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test Wed Mar 19
12:29:20 2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile)
@@ -0,0 +1,62 @@
+# $FreeBSD$
+# This test checks the code reading archive files. The archive file
+# is an old BSD file with __.SYMTAB and no long file names. Filenames
+# are truncated to 16 characters.
+
+#############################################################################
+
+# must be ok
+test1: libtest.a(short.o)
+ @:
+
+libtest.a(short.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test2: libtest.a(exactly15char.o)
+ @:
+
+libtest.a(exactly15char.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test3: libtest.a(exactly16chars.o)
+ @:
+
+libtest.a(exactly16chars.o): ood
+ @:
+
+#############################################################################
+
+# must be ok
+test4: libtest.a(verylongobjectname.o)
+ @:
+
+libtest.a(verylongobjectname.o): ood
+ @:
+
+#############################################################################
+
+# Truncated to 16 characters
+# must be ok
+test5: libtest.a(verylongobjectna)
+ @:
+
+#############################################################################
+
+# Truncated to 15 characters
+# must fail
+test6: libtest.a(verylongobjectn)
+ @:
+
+#############################################################################
+
+# must fail
+test7: libtest.a(\#1/20)
+ @:
+
+ood:
Copied and modified: head/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
(from r263227, head/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t Sun Mar
16 08:04:06 2014 (r263227, copy source)
+++ head/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh Wed Mar 19
12:29:20 2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="Archive parsing (old BSD format)."
Copied and modified: head/usr.bin/make/tests/basic/t0/legacy_test.sh (from
r263227, head/tools/regression/usr.bin/make/basic/t0/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/basic/t0/test.t Sun Mar 16 08:04:06
2014 (r263227, copy source)
+++ head/usr.bin/make/tests/basic/t0/legacy_test.sh Wed Mar 19 12:29:20
2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="An empty Makefile file and no target given."
Copied: head/usr.bin/make/tests/basic/t1/Makefile.test (from r263227,
head/tools/regression/usr.bin/make/basic/t1/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/basic/t1/Makefile.test Wed Mar 19 12:29:20
2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/basic/t1/Makefile)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+#
+# Just a target and nothing else. No target on command line.
+#
+all:
Copied and modified: head/usr.bin/make/tests/basic/t1/legacy_test.sh (from
r263227, head/tools/regression/usr.bin/make/basic/t1/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/basic/t1/test.t Sun Mar 16 08:04:06
2014 (r263227, copy source)
+++ head/usr.bin/make/tests/basic/t1/legacy_test.sh Wed Mar 19 12:29:20
2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="A Makefile file with only a 'all:' file dependency specification."
Copied: head/usr.bin/make/tests/basic/t2/Makefile.test (from r263227,
head/tools/regression/usr.bin/make/basic/t2/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/basic/t2/Makefile.test Wed Mar 19 12:29:20
2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/basic/t2/Makefile)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+#
+# Just a target and a command. No command line targets.
+#
+all:
+ echo hello
Copied and modified: head/usr.bin/make/tests/basic/t2/legacy_test.sh (from
r263227, head/tools/regression/usr.bin/make/basic/t2/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/basic/t2/test.t Sun Mar 16 08:04:06
2014 (r263227, copy source)
+++ head/usr.bin/make/tests/basic/t2/legacy_test.sh Wed Mar 19 12:29:20
2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="A Makefile file with only a 'all:' file dependency specification, and
shell command."
Copied and modified: head/usr.bin/make/tests/basic/t3/legacy_test.sh (from
r263227, head/tools/regression/usr.bin/make/basic/t3/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/basic/t3/test.t Sun Mar 16 08:04:06
2014 (r263227, copy source)
+++ head/usr.bin/make/tests/basic/t3/legacy_test.sh Wed Mar 19 12:29:20
2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
# Description
DESC="No Makefile file, no command line target."
Modified: head/usr.bin/make/tests/common.sh
==============================================================================
--- head/tools/regression/usr.bin/make/common.sh Sun Mar 16 08:04:06
2014 (r263227)
+++ head/usr.bin/make/tests/common.sh Wed Mar 19 12:29:20 2014
(r263346)
@@ -1,8 +1,6 @@
-#!/bin/sh
+# $FreeBSD$
#
# Common code used run regression tests for usr.bin/make.
-#
-# $FreeBSD$
#
# Output a message and exit with an error.
@@ -99,8 +97,8 @@ common_setup()
#
# If a Makefile exists in the source directory - copy it over
#
- if [ -e Makefile -a ! -e ${WORK_DIR}/Makefile ] ; then
- cp Makefile ${WORK_DIR}/Makefile
+ if [ -e ${SRC_DIR}/Makefile.test -a ! -e ${WORK_DIR}/Makefile ] ; then
+ cp ${SRC_DIR}/Makefile.test ${WORK_DIR}/Makefile
fi
#
@@ -123,10 +121,11 @@ common_setup()
#
set -- ${TEST_COPY_FILES}
while [ $# -ne 0 ] ; do
- if [ ! -e ${WORK_DIR}/${1} ] ; then
- cp ${1} ${WORK_DIR}/${1}
+ local dstname="$(echo ${1} | sed -e
's,Makefile.test,Makefile,')"
+ if [ ! -e ${WORK_DIR}/${dstname} ] ; then
+ cp ${SRC_DIR}/${1} ${WORK_DIR}/${dstname}
fi
- chmod ${2} ${WORK_DIR}/${1}
+ chmod ${2} ${WORK_DIR}/${dstname}
shift ; shift
done
@@ -338,23 +337,24 @@ eval_compare()
else
eval skip=\${TEST_${N}_SKIP}
fi
+ msg=
if [ ! -z "$fail" ]; then
- echo -n "not "
+ msg="${msg}not "
fi
- echo -n "ok ${N} ${SUBDIR}/${N}"
+ msg="${msg}ok ${N} ${SUBDIR}/${N}"
if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then
- echo -n " # "
+ msg="${msg} # "
fi
if [ ! -z "$skip" ] ; then
- echo -n "skip $skip; "
+ msg="${msg}skip ${skip}; "
fi
if [ ! -z "$todo" ] ; then
- echo -n "TODO $todo; "
+ msg="${msg}TODO ${todo}; "
fi
if [ ! -z "$fail" ] ; then
- echo "reason: ${fail}"
+ msg="${msg}reason: ${fail}"
fi
- echo
+ echo ${msg}
N=$((N + 1))
done
}
@@ -368,11 +368,13 @@ eval_compare()
do_compare()
{
local EXPECTED RESULT
- EXPECTED="expected.$1.$2"
+ EXPECTED="${SRC_DIR}/expected.$1.$2"
RESULT="${OUTPUT_DIR}/$1.$2"
if [ -f $EXPECTED ]; then
- diff -q $EXPECTED $RESULT 1>/dev/null 2>/dev/null
+ cat $RESULT | sed -e "s,^$(basename $MAKE_PROG):,make:," | \
+ diff -u $EXPECTED -
+ #diff -q $EXPECTED - 1>/dev/null 2>/dev/null
return $?
else
return 1 # FAIL
@@ -412,7 +414,7 @@ eval_diff()
do_diff()
{
local EXPECTED RESULT
- EXPECTED="expected.$1.$2"
+ EXPECTED="${SRC_DIR}/expected.$1.$2"
RESULT="${OUTPUT_DIR}/$1.$2"
echo diff -u $EXPECTED $RESULT
@@ -513,49 +515,16 @@ eval_cmd()
#
#
-# Parse command line arguments.
-#
-args=`getopt m:w:v $*`
-if [ $? != 0 ]; then
- echo 'Usage: ...'
- exit 2
-fi
-set -- $args
-for i; do
- case "$i" in
- -m)
- MAKE_PROG="$2"
- shift
- shift
- ;;
- -w)
- WORK_BASE="$2"
- shift
- shift
- ;;
- -v)
- VERBOSE=1
- shift
- ;;
- --)
- shift
- break
- ;;
- esac
-done
-
-#
# Determine our sub-directory. Argh.
#
-SRC_DIR=`pwd`
-SRC_BASE=`while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
+SRC_DIR=$(dirname $0)
+SRC_BASE=`cd ${SRC_DIR} ; while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
SUBDIR=`echo ${SRC_DIR} | sed "s@${SRC_BASE}/@@"`
#
# Construct working directory
#
-WORK_BASE=${WORK_BASE:-"/tmp/$USER.make.test"}
-WORK_DIR=${WORK_BASE}/${SUBDIR}
+WORK_DIR=$(pwd)/work/${SUBDIR}
OUTPUT_DIR=${WORK_DIR}.OUTPUT
#
Copied: head/usr.bin/make/tests/execution/ellipsis/Makefile.test (from r263227,
head/tools/regression/usr.bin/make/execution/ellipsis/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/execution/ellipsis/Makefile.test Wed Mar 19
12:29:20 2014 (r263346, copy of r263227,
head/tools/regression/usr.bin/make/execution/ellipsis/Makefile)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+ELLIPSIS= ...
+
+check-ellipsis:
+ @${MAKE} -f ${MAKEFILE} do-$@
+ @${MAKE} -f ${MAKEFILE} -j2 do-$@
+ @${MAKE} -f ${MAKEFILE} -j2 -B do-$@
+
+do-check-ellipsis: do-check-ellipsis-1 do-check-ellipsis-2
+.ORDER: do-check-ellipsis-1 do-check-ellipsis-2
+
+do-check-ellipsis-1:
+ @echo before $@
+ ${ELLIPSIS}
+ @echo after $@
+
+do-check-ellipsis-2:
+ @echo before $@
+ ${ELLIPSIS}
+ @echo after $@
Copied and modified: head/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
(from r263227, head/tools/regression/usr.bin/make/execution/ellipsis/test.t)
==============================================================================
--- head/tools/regression/usr.bin/make/execution/ellipsis/test.t Sun Mar
16 08:04:06 2014 (r263227, copy source)
+++ head/usr.bin/make/tests/execution/ellipsis/legacy_test.sh Wed Mar 19
12:29:20 2014 (r263346)
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
# $FreeBSD$
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
