From d525bcd959742df2fe7f3dbcd251284537121190 Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Wed, 19 Mar 2014 12:29:20 +0000 Subject: [PATCH] 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@. --- etc/mtree/BSD.tests.dist | 98 +++++ tools/build/mk/OptionalObsoleteFiles.inc | 370 ++++++++++++++++++ tools/regression/usr.bin/make/all.sh | 16 - usr.bin/make/Makefile | 4 + .../make => usr.bin/make/tests}/README | 4 +- .../tests/archives/fmt_44bsd/Makefile.test | 0 .../archives/fmt_44bsd/expected.status.1 | 0 .../archives/fmt_44bsd/expected.status.2 | 0 .../archives/fmt_44bsd/expected.status.3 | 0 .../archives/fmt_44bsd/expected.status.4 | 0 .../archives/fmt_44bsd/expected.status.5 | 0 .../archives/fmt_44bsd/expected.status.6 | 0 .../archives/fmt_44bsd/expected.status.7 | 0 .../archives/fmt_44bsd/expected.stderr.1 | 0 .../archives/fmt_44bsd/expected.stderr.2 | 0 .../archives/fmt_44bsd/expected.stderr.3 | 0 .../archives/fmt_44bsd/expected.stderr.4 | 0 .../archives/fmt_44bsd/expected.stderr.5 | 0 .../archives/fmt_44bsd/expected.stderr.6 | 0 .../archives/fmt_44bsd/expected.stderr.7 | 0 .../archives/fmt_44bsd/expected.stdout.1 | 0 .../archives/fmt_44bsd/expected.stdout.2 | 0 .../archives/fmt_44bsd/expected.stdout.3 | 0 .../archives/fmt_44bsd/expected.stdout.4 | 0 .../archives/fmt_44bsd/expected.stdout.5 | 0 .../archives/fmt_44bsd/expected.stdout.6 | 0 .../archives/fmt_44bsd/expected.stdout.7 | 0 .../tests/archives/fmt_44bsd/legacy_test.sh | 6 +- .../make/tests}/archives/fmt_44bsd/libtest.a | Bin .../archives/fmt_44bsd_mod/Makefile.test | 0 .../archives/fmt_44bsd_mod/expected.status.1 | 0 .../archives/fmt_44bsd_mod/expected.status.2 | 0 .../archives/fmt_44bsd_mod/expected.status.3 | 0 .../archives/fmt_44bsd_mod/expected.status.4 | 0 .../archives/fmt_44bsd_mod/expected.status.5 | 0 .../archives/fmt_44bsd_mod/expected.status.6 | 0 .../archives/fmt_44bsd_mod/expected.status.7 | 0 .../archives/fmt_44bsd_mod/expected.stderr.1 | 0 .../archives/fmt_44bsd_mod/expected.stderr.2 | 0 .../archives/fmt_44bsd_mod/expected.stderr.3 | 0 .../archives/fmt_44bsd_mod/expected.stderr.4 | 0 .../archives/fmt_44bsd_mod/expected.stderr.5 | 0 .../archives/fmt_44bsd_mod/expected.stderr.6 | 0 .../archives/fmt_44bsd_mod/expected.stderr.7 | 0 .../archives/fmt_44bsd_mod/expected.stdout.1 | 0 .../archives/fmt_44bsd_mod/expected.stdout.2 | 0 .../archives/fmt_44bsd_mod/expected.stdout.3 | 0 .../archives/fmt_44bsd_mod/expected.stdout.4 | 0 .../archives/fmt_44bsd_mod/expected.stdout.5 | 0 .../archives/fmt_44bsd_mod/expected.stdout.6 | 0 .../archives/fmt_44bsd_mod/expected.stdout.7 | 0 .../archives/fmt_44bsd_mod/legacy_test.sh | 6 +- .../tests}/archives/fmt_44bsd_mod/libtest.a | Bin .../tests/archives/fmt_oldbsd/Makefile.test | 0 .../archives/fmt_oldbsd/expected.status.1 | 0 .../archives/fmt_oldbsd/expected.status.2 | 0 .../archives/fmt_oldbsd/expected.status.3 | 0 .../archives/fmt_oldbsd/expected.status.4 | 0 .../archives/fmt_oldbsd/expected.status.5 | 0 .../archives/fmt_oldbsd/expected.status.6 | 0 .../archives/fmt_oldbsd/expected.status.7 | 0 .../archives/fmt_oldbsd/expected.stderr.1 | 0 .../archives/fmt_oldbsd/expected.stderr.2 | 0 .../archives/fmt_oldbsd/expected.stderr.3 | 0 .../archives/fmt_oldbsd/expected.stderr.4 | 0 .../archives/fmt_oldbsd/expected.stderr.5 | 0 .../archives/fmt_oldbsd/expected.stderr.6 | 0 .../archives/fmt_oldbsd/expected.stderr.7 | 0 .../archives/fmt_oldbsd/expected.stdout.1 | 0 .../archives/fmt_oldbsd/expected.stdout.2 | 0 .../archives/fmt_oldbsd/expected.stdout.3 | 0 .../archives/fmt_oldbsd/expected.stdout.4 | 0 .../archives/fmt_oldbsd/expected.stdout.5 | 0 .../archives/fmt_oldbsd/expected.stdout.6 | 0 .../archives/fmt_oldbsd/expected.stdout.7 | 0 .../tests/archives/fmt_oldbsd/legacy_test.sh | 6 +- .../make/tests}/archives/fmt_oldbsd/libtest.a | Bin .../make/tests}/basic/t0/expected.status.1 | 0 .../make/tests}/basic/t0/expected.stderr.1 | 0 .../make/tests}/basic/t0/expected.stdout.1 | 0 .../make/tests/basic/t0/legacy_test.sh | 6 +- .../make/tests/basic/t1/Makefile.test | 0 .../make/tests}/basic/t1/expected.status.1 | 0 .../make/tests}/basic/t1/expected.stderr.1 | 0 .../make/tests}/basic/t1/expected.stdout.1 | 0 .../make/tests/basic/t1/legacy_test.sh | 6 +- .../make/tests/basic/t2/Makefile.test | 0 .../make/tests}/basic/t2/expected.status.1 | 0 .../make/tests}/basic/t2/expected.stderr.1 | 0 .../make/tests}/basic/t2/expected.stdout.1 | 0 .../make/tests/basic/t2/legacy_test.sh | 6 +- .../make/tests}/basic/t3/expected.status.1 | 0 .../make/tests}/basic/t3/expected.stderr.1 | 0 .../make/tests}/basic/t3/expected.stdout.1 | 0 .../make/tests/basic/t3/legacy_test.sh | 6 +- .../make => usr.bin/make/tests}/common.sh | 77 ++-- .../tests/execution/ellipsis/Makefile.test | 0 .../execution/ellipsis/expected.status.1 | 0 .../execution/ellipsis/expected.stderr.1 | 0 .../execution/ellipsis/expected.stdout.1 | 0 .../tests/execution/ellipsis/legacy_test.sh | 6 +- .../make/tests/execution/empty/Makefile.test | 0 .../tests}/execution/empty/expected.status.1 | 0 .../tests}/execution/empty/expected.stderr.1 | 0 .../tests}/execution/empty/expected.stdout.1 | 0 .../make/tests/execution/empty/legacy_test.sh | 6 +- .../make/tests/execution/joberr/Makefile.test | 0 .../tests}/execution/joberr/expected.status.1 | 0 .../tests}/execution/joberr/expected.stderr.1 | 0 .../tests}/execution/joberr/expected.stdout.1 | 0 .../tests/execution/joberr/legacy_test.sh | 6 +- .../make/tests/execution/plus/Makefile.test | 0 .../tests}/execution/plus/expected.status.1 | 0 .../tests}/execution/plus/expected.stderr.1 | 0 .../tests}/execution/plus/expected.stdout.1 | 0 .../make/tests/execution/plus/legacy_test.sh | 6 +- .../make/tests/shell/builtin/Makefile.test | 0 .../tests}/shell/builtin/expected.status.1 | 0 .../tests}/shell/builtin/expected.status.2 | 0 .../tests}/shell/builtin/expected.stderr.1 | 0 .../tests}/shell/builtin/expected.stderr.2 | 0 .../tests}/shell/builtin/expected.stdout.1 | 0 .../tests}/shell/builtin/expected.stdout.2 | 0 .../make/tests/shell/builtin/legacy_test.sh | 6 +- .../make/tests}/shell/builtin/sh | 0 .../make/tests/shell/meta/Makefile.test | 0 .../make/tests}/shell/meta/expected.status.1 | 0 .../make/tests}/shell/meta/expected.status.2 | 0 .../make/tests}/shell/meta/expected.stderr.1 | 0 .../make/tests}/shell/meta/expected.stderr.2 | 0 .../make/tests}/shell/meta/expected.stdout.1 | 0 .../make/tests}/shell/meta/expected.stdout.2 | 0 .../make/tests/shell/meta/legacy_test.sh | 6 +- .../make => usr.bin/make/tests}/shell/meta/sh | 0 .../make/tests/shell/path/Makefile.test | 0 .../make/tests}/shell/path/expected.status.1 | 0 .../make/tests}/shell/path/expected.status.2 | 0 .../make/tests}/shell/path/expected.stderr.1 | 0 .../make/tests}/shell/path/expected.stderr.2 | 0 .../make/tests}/shell/path/expected.stdout.1 | 0 .../make/tests}/shell/path/expected.stdout.2 | 0 .../make/tests/shell/path/legacy_test.sh | 6 +- .../make => usr.bin/make/tests}/shell/path/sh | 0 .../tests/shell/path_select/Makefile.test | 0 .../shell/path_select/expected.status.1 | 0 .../shell/path_select/expected.status.2 | 0 .../shell/path_select/expected.stderr.1 | 0 .../shell/path_select/expected.stderr.2 | 0 .../shell/path_select/expected.stdout.1 | 0 .../shell/path_select/expected.stdout.2 | 0 .../tests/shell/path_select/legacy_test.sh | 6 +- .../make/tests}/shell/path_select/shell | 0 .../make/tests/shell/replace/Makefile.test | 0 .../tests}/shell/replace/expected.status.1 | 0 .../tests}/shell/replace/expected.status.2 | 0 .../tests}/shell/replace/expected.stderr.1 | 0 .../tests}/shell/replace/expected.stderr.2 | 0 .../tests}/shell/replace/expected.stdout.1 | 0 .../tests}/shell/replace/expected.stdout.2 | 0 .../make/tests/shell/replace/legacy_test.sh | 6 +- .../make/tests}/shell/replace/shell | 0 .../make/tests/shell/select/Makefile.test | 2 +- .../tests}/shell/select/expected.status.1 | 0 .../tests}/shell/select/expected.status.2 | 0 .../tests}/shell/select/expected.stderr.1 | 0 .../tests}/shell/select/expected.stderr.2 | 0 .../tests}/shell/select/expected.stdout.1 | 0 .../tests}/shell/select/expected.stdout.2 | 0 .../make/tests/shell/select/legacy_test.sh | 6 +- .../make/tests/suffixes/basic/Makefile.test | 0 .../make/tests}/suffixes/basic/TEST1.a | 0 .../tests}/suffixes/basic/expected.status.1 | 0 .../tests}/suffixes/basic/expected.stderr.1 | 0 .../tests}/suffixes/basic/expected.stdout.1 | 0 .../make/tests/suffixes/basic/legacy_test.sh | 6 +- .../tests/suffixes/src_wild1/Makefile.test | 0 .../make/tests}/suffixes/src_wild1/TEST1.a | 0 .../make/tests}/suffixes/src_wild1/TEST2.a | 0 .../suffixes/src_wild1/expected.status.1 | 0 .../suffixes/src_wild1/expected.stderr.1 | 0 .../suffixes/src_wild1/expected.stdout.1 | 0 .../tests/suffixes/src_wild1/legacy_test.sh | 6 +- .../tests/suffixes/src_wild2/Makefile.test | 0 .../make/tests}/suffixes/src_wild2/TEST1.a | 0 .../make/tests}/suffixes/src_wild2/TEST2.a | 0 .../suffixes/src_wild2/expected.status.1 | 0 .../suffixes/src_wild2/expected.stderr.1 | 0 .../suffixes/src_wild2/expected.stdout.1 | 0 .../tests/suffixes/src_wild2/legacy_test.sh | 6 +- .../tests/syntax/directive-t0/Makefile.test | 0 .../syntax/directive-t0/expected.status.1 | 0 .../syntax/directive-t0/expected.stderr.1 | 0 .../syntax/directive-t0/expected.stdout.1 | 0 .../tests/syntax/directive-t0/legacy_test.sh | 3 +- .../make/tests/syntax/enl/Makefile.test | 0 .../make/tests}/syntax/enl/expected.status.1 | 0 .../make/tests}/syntax/enl/expected.status.2 | 0 .../make/tests}/syntax/enl/expected.status.3 | 0 .../make/tests}/syntax/enl/expected.status.4 | 0 .../make/tests}/syntax/enl/expected.status.5 | 0 .../make/tests}/syntax/enl/expected.stderr.1 | 0 .../make/tests}/syntax/enl/expected.stderr.2 | 0 .../make/tests}/syntax/enl/expected.stderr.3 | 0 .../make/tests}/syntax/enl/expected.stderr.4 | 0 .../make/tests}/syntax/enl/expected.stderr.5 | 0 .../make/tests}/syntax/enl/expected.stdout.1 | 0 .../make/tests}/syntax/enl/expected.stdout.2 | 0 .../make/tests}/syntax/enl/expected.stdout.3 | 0 .../make/tests}/syntax/enl/expected.stdout.4 | 0 .../make/tests}/syntax/enl/expected.stdout.5 | 0 .../make/tests/syntax/enl/legacy_test.sh | 6 +- .../tests/syntax/funny-targets/Makefile.test | 0 .../syntax/funny-targets/expected.status.1 | 0 .../syntax/funny-targets/expected.status.2 | 0 .../syntax/funny-targets/expected.stderr.1 | 0 .../syntax/funny-targets/expected.stderr.2 | 0 .../syntax/funny-targets/expected.stdout.1 | 0 .../syntax/funny-targets/expected.stdout.2 | 0 .../tests/syntax/funny-targets/legacy_test.sh | 6 +- .../make/tests/syntax/semi/Makefile.test | 0 .../make/tests}/syntax/semi/expected.status.1 | 0 .../make/tests}/syntax/semi/expected.status.2 | 0 .../make/tests}/syntax/semi/expected.stderr.1 | 0 .../make/tests}/syntax/semi/expected.stderr.2 | 0 .../make/tests}/syntax/semi/expected.stdout.1 | 0 .../make/tests}/syntax/semi/expected.stdout.2 | 0 .../make/tests/syntax/semi/legacy_test.sh | 6 +- .../make/tests/sysmk/t0/2/1/Makefile.test | 0 .../tests}/sysmk/t0/2/1/expected.status.1 | 0 .../tests}/sysmk/t0/2/1/expected.stderr.1 | 0 .../tests}/sysmk/t0/2/1/expected.stdout.1 | 0 .../make/tests/sysmk/t0/2/1/legacy_test.sh | 6 +- .../make/tests/sysmk/t0/mk/sys.mk.test | 0 .../make/tests}/sysmk/t1/2/1/cleanup | 0 .../tests}/sysmk/t1/2/1/expected.status.1 | 0 .../tests}/sysmk/t1/2/1/expected.stderr.1 | 0 .../tests}/sysmk/t1/2/1/expected.stdout.1 | 0 .../make/tests/sysmk/t1/2/1/legacy_test.sh | 8 +- .../make/tests/sysmk/t1/mk/sys.mk.test | 0 .../make/tests}/sysmk/t2/2/1/cleanup | 0 .../tests}/sysmk/t2/2/1/expected.status.1 | 0 .../tests}/sysmk/t2/2/1/expected.stderr.1 | 0 .../tests}/sysmk/t2/2/1/expected.stdout.1 | 0 .../make/tests/sysmk/t2/2/1/legacy_test.sh | 8 +- .../make/tests/sysmk/t2/mk/sys.mk.test | 0 .../make => usr.bin/make/tests}/test-new.mk | 0 .../tests/variables/modifier_M/Makefile.test | 0 .../variables/modifier_M/expected.status.1 | 0 .../variables/modifier_M/expected.stderr.1 | 0 .../variables/modifier_M/expected.stdout.1 | 0 .../tests/variables/modifier_M/legacy_test.sh | 6 +- .../tests/variables/modifier_t/Makefile.test | 0 .../variables/modifier_t/expected.status.1 | 0 .../variables/modifier_t/expected.status.2 | 0 .../variables/modifier_t/expected.status.3 | 0 .../variables/modifier_t/expected.stderr.1 | 0 .../variables/modifier_t/expected.stderr.2 | 0 .../variables/modifier_t/expected.stderr.3 | 0 .../variables/modifier_t/expected.stdout.1 | 0 .../variables/modifier_t/expected.stdout.2 | 0 .../variables/modifier_t/expected.stdout.3 | 0 .../tests/variables/modifier_t/legacy_test.sh | 6 +- .../make/tests/variables/opt_V/Makefile.test | 0 .../tests}/variables/opt_V/expected.status.1 | 0 .../tests}/variables/opt_V/expected.status.2 | 0 .../tests}/variables/opt_V/expected.stderr.1 | 0 .../tests}/variables/opt_V/expected.stderr.2 | 0 .../tests}/variables/opt_V/expected.stdout.1 | 0 .../tests}/variables/opt_V/expected.stdout.2 | 0 .../make/tests/variables/opt_V/legacy_test.sh | 6 +- .../make/tests/variables/t0/Makefile.test | 0 .../tests}/variables/t0/expected.status.1 | 0 .../tests}/variables/t0/expected.stderr.1 | 0 .../tests}/variables/t0/expected.stdout.1 | 0 .../make/tests/variables/t0/legacy_test.sh | 6 +- 275 files changed, 560 insertions(+), 198 deletions(-) delete mode 100755 tools/regression/usr.bin/make/all.sh rename {tools/regression/usr.bin/make => usr.bin/make/tests}/README (97%) rename tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile => usr.bin/make/tests/archives/fmt_44bsd/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.status.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stderr.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/expected.stdout.7 (100%) rename tools/regression/usr.bin/make/archives/fmt_44bsd/test.t => usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh (75%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd/libtest.a (100%) rename tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile => usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.status.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stderr.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/expected.stdout.7 (100%) rename tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t => usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh (76%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_44bsd_mod/libtest.a (100%) rename tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile => usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.status.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stderr.7 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.6 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/expected.stdout.7 (100%) rename tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t => usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh (75%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/archives/fmt_oldbsd/libtest.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t0/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t0/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t0/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/basic/t0/test.t => usr.bin/make/tests/basic/t0/legacy_test.sh (76%) rename tools/regression/usr.bin/make/basic/t1/Makefile => usr.bin/make/tests/basic/t1/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t1/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t1/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t1/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/basic/t1/test.t => usr.bin/make/tests/basic/t1/legacy_test.sh (75%) rename tools/regression/usr.bin/make/basic/t2/Makefile => usr.bin/make/tests/basic/t2/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t2/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t2/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t2/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/basic/t2/test.t => usr.bin/make/tests/basic/t2/legacy_test.sh (77%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t3/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t3/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/basic/t3/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/basic/t3/test.t => usr.bin/make/tests/basic/t3/legacy_test.sh (71%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/common.sh (90%) rename tools/regression/usr.bin/make/execution/ellipsis/Makefile => usr.bin/make/tests/execution/ellipsis/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/ellipsis/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/ellipsis/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/ellipsis/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/execution/ellipsis/test.t => usr.bin/make/tests/execution/ellipsis/legacy_test.sh (69%) rename tools/regression/usr.bin/make/execution/empty/Makefile => usr.bin/make/tests/execution/empty/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/empty/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/empty/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/empty/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/execution/empty/test.t => usr.bin/make/tests/execution/empty/legacy_test.sh (69%) rename tools/regression/usr.bin/make/execution/joberr/Makefile => usr.bin/make/tests/execution/joberr/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/joberr/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/joberr/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/joberr/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/execution/joberr/test.t => usr.bin/make/tests/execution/joberr/legacy_test.sh (68%) rename tools/regression/usr.bin/make/execution/plus/Makefile => usr.bin/make/tests/execution/plus/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/plus/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/plus/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/execution/plus/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/execution/plus/test.t => usr.bin/make/tests/execution/plus/legacy_test.sh (70%) rename tools/regression/usr.bin/make/shell/builtin/Makefile => usr.bin/make/tests/shell/builtin/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/builtin/test.t => usr.bin/make/tests/shell/builtin/legacy_test.sh (82%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/builtin/sh (100%) rename tools/regression/usr.bin/make/shell/meta/Makefile => usr.bin/make/tests/shell/meta/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/meta/test.t => usr.bin/make/tests/shell/meta/legacy_test.sh (82%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/meta/sh (100%) rename tools/regression/usr.bin/make/shell/path/Makefile => usr.bin/make/tests/shell/path/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/path/test.t => usr.bin/make/tests/shell/path/legacy_test.sh (84%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path/sh (100%) rename tools/regression/usr.bin/make/shell/path_select/Makefile => usr.bin/make/tests/shell/path_select/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/path_select/test.t => usr.bin/make/tests/shell/path_select/legacy_test.sh (82%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/path_select/shell (100%) rename tools/regression/usr.bin/make/shell/replace/Makefile => usr.bin/make/tests/shell/replace/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/replace/test.t => usr.bin/make/tests/shell/replace/legacy_test.sh (77%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/replace/shell (100%) rename tools/regression/usr.bin/make/shell/select/Makefile => usr.bin/make/tests/shell/select/Makefile.test (89%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/shell/select/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/shell/select/test.t => usr.bin/make/tests/shell/select/legacy_test.sh (79%) rename tools/regression/usr.bin/make/suffixes/basic/Makefile => usr.bin/make/tests/suffixes/basic/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/basic/TEST1.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/basic/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/basic/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/basic/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/suffixes/basic/test.t => usr.bin/make/tests/suffixes/basic/legacy_test.sh (79%) rename tools/regression/usr.bin/make/suffixes/src_wild1/Makefile => usr.bin/make/tests/suffixes/src_wild1/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild1/TEST1.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild1/TEST2.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild1/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild1/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild1/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/suffixes/src_wild1/test.t => usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh (80%) rename tools/regression/usr.bin/make/suffixes/src_wild2/Makefile => usr.bin/make/tests/suffixes/src_wild2/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild2/TEST1.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild2/TEST2.a (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild2/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild2/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/suffixes/src_wild2/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/suffixes/src_wild2/test.t => usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh (81%) rename tools/regression/usr.bin/make/syntax/directive-t0/Makefile => usr.bin/make/tests/syntax/directive-t0/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/directive-t0/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/directive-t0/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/directive-t0/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/syntax/directive-t0/test.t => usr.bin/make/tests/syntax/directive-t0/legacy_test.sh (75%) rename tools/regression/usr.bin/make/syntax/enl/Makefile => usr.bin/make/tests/syntax/enl/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.status.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.status.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.status.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stderr.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stderr.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stderr.5 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stdout.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stdout.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stdout.4 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/enl/expected.stdout.5 (100%) rename tools/regression/usr.bin/make/syntax/enl/test.t => usr.bin/make/tests/syntax/enl/legacy_test.sh (73%) rename tools/regression/usr.bin/make/syntax/funny-targets/Makefile => usr.bin/make/tests/syntax/funny-targets/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/funny-targets/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/syntax/funny-targets/test.t => usr.bin/make/tests/syntax/funny-targets/legacy_test.sh (70%) rename tools/regression/usr.bin/make/syntax/semi/Makefile => usr.bin/make/tests/syntax/semi/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/syntax/semi/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/syntax/semi/test.t => usr.bin/make/tests/syntax/semi/legacy_test.sh (71%) rename tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile => usr.bin/make/tests/sysmk/t0/2/1/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t0/2/1/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t0/2/1/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t0/2/1/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/sysmk/t0/2/1/test.t => usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh (79%) rename tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk => usr.bin/make/tests/sysmk/t0/mk/sys.mk.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t1/2/1/cleanup (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t1/2/1/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t1/2/1/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t1/2/1/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/sysmk/t1/2/1/test.t => usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh (81%) rename tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk => usr.bin/make/tests/sysmk/t1/mk/sys.mk.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t2/2/1/cleanup (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t2/2/1/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t2/2/1/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/sysmk/t2/2/1/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/sysmk/t2/2/1/test.t => usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh (81%) rename tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk => usr.bin/make/tests/sysmk/t2/mk/sys.mk.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/test-new.mk (100%) rename tools/regression/usr.bin/make/variables/modifier_M/Makefile => usr.bin/make/tests/variables/modifier_M/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_M/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_M/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_M/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/variables/modifier_M/test.t => usr.bin/make/tests/variables/modifier_M/legacy_test.sh (64%) rename tools/regression/usr.bin/make/variables/modifier_t/Makefile => usr.bin/make/tests/variables/modifier_t/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.status.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stderr.3 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stdout.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/modifier_t/expected.stdout.3 (100%) rename tools/regression/usr.bin/make/variables/modifier_t/test.t => usr.bin/make/tests/variables/modifier_t/legacy_test.sh (68%) rename tools/regression/usr.bin/make/variables/opt_V/Makefile => usr.bin/make/tests/variables/opt_V/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.status.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.stderr.2 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.stdout.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/opt_V/expected.stdout.2 (100%) rename tools/regression/usr.bin/make/variables/opt_V/test.t => usr.bin/make/tests/variables/opt_V/legacy_test.sh (70%) rename tools/regression/usr.bin/make/variables/t0/Makefile => usr.bin/make/tests/variables/t0/Makefile.test (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/t0/expected.status.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/t0/expected.stderr.1 (100%) rename {tools/regression/usr.bin/make => usr.bin/make/tests}/variables/t0/expected.stdout.1 (100%) rename tools/regression/usr.bin/make/variables/t0/test.t => usr.bin/make/tests/variables/t0/legacy_test.sh (60%) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 9a2a14c3187..5c0570514ab 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 6f34d3146e5..d787cb9a37e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4129,6 +4129,376 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test 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 diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh deleted file mode 100755 index 42f9e73e6ab..00000000000 --- a/tools/regression/usr.bin/make/all.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# find all test scripts below our current directory -SCRIPTS=`find . -name test.t` - -if [ -z "${SCRIPTS}" ] ; then - exit 0 -fi - -for i in ${SCRIPTS} ; do - ( - cd `dirname $i` - sh ./test.t $1 - ) -done diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 4605bb39ab1..9b8290c5b64 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -118,4 +118,8 @@ fmake.1: make.1 cp ${.ALLSRC} ${.TARGET} .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/tools/regression/usr.bin/make/README b/usr.bin/make/tests/README similarity index 97% rename from tools/regression/usr.bin/make/README rename to usr.bin/make/tests/README index 32b4ddc5168..1ac209b5715 100644 --- a/tools/regression/usr.bin/make/README +++ b/usr.bin/make/tests/README @@ -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). ---------------------------------------------------------------------------- diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile rename to usr.bin/make/tests/archives/fmt_44bsd/Makefile.test diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 rename to usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh similarity index 75% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/test.t rename to usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh index eba6aed9e38..2604c9642b0 100644 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t +++ b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh @@ -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)." diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd/libtest.a similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a rename to usr.bin/make/tests/archives/fmt_44bsd/libtest.a diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile rename to usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 rename to usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh similarity index 76% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t rename to usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh index aa65a3e9587..bf13f228862 100644 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t +++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh @@ -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)." diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a rename to usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile rename to usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 rename to usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh similarity index 75% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t rename to usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh index 03f7800a78d..c7980c54dc3 100644 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t +++ b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh @@ -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)." diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a b/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a similarity index 100% rename from tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a rename to usr.bin/make/tests/archives/fmt_oldbsd/libtest.a diff --git a/tools/regression/usr.bin/make/basic/t0/expected.status.1 b/usr.bin/make/tests/basic/t0/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t0/expected.status.1 rename to usr.bin/make/tests/basic/t0/expected.status.1 diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 b/usr.bin/make/tests/basic/t0/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t0/expected.stderr.1 rename to usr.bin/make/tests/basic/t0/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 b/usr.bin/make/tests/basic/t0/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t0/expected.stdout.1 rename to usr.bin/make/tests/basic/t0/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/usr.bin/make/tests/basic/t0/legacy_test.sh similarity index 76% rename from tools/regression/usr.bin/make/basic/t0/test.t rename to usr.bin/make/tests/basic/t0/legacy_test.sh index d71a39a8a1a..d23418afc13 100644 --- a/tools/regression/usr.bin/make/basic/t0/test.t +++ b/usr.bin/make/tests/basic/t0/legacy_test.sh @@ -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." diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/usr.bin/make/tests/basic/t1/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/basic/t1/Makefile rename to usr.bin/make/tests/basic/t1/Makefile.test diff --git a/tools/regression/usr.bin/make/basic/t1/expected.status.1 b/usr.bin/make/tests/basic/t1/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t1/expected.status.1 rename to usr.bin/make/tests/basic/t1/expected.status.1 diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 b/usr.bin/make/tests/basic/t1/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t1/expected.stderr.1 rename to usr.bin/make/tests/basic/t1/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 b/usr.bin/make/tests/basic/t1/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t1/expected.stdout.1 rename to usr.bin/make/tests/basic/t1/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/usr.bin/make/tests/basic/t1/legacy_test.sh similarity index 75% rename from tools/regression/usr.bin/make/basic/t1/test.t rename to usr.bin/make/tests/basic/t1/legacy_test.sh index 4131f5da859..b07f927a57c 100644 --- a/tools/regression/usr.bin/make/basic/t1/test.t +++ b/usr.bin/make/tests/basic/t1/legacy_test.sh @@ -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." diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/usr.bin/make/tests/basic/t2/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/basic/t2/Makefile rename to usr.bin/make/tests/basic/t2/Makefile.test diff --git a/tools/regression/usr.bin/make/basic/t2/expected.status.1 b/usr.bin/make/tests/basic/t2/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t2/expected.status.1 rename to usr.bin/make/tests/basic/t2/expected.status.1 diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 b/usr.bin/make/tests/basic/t2/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t2/expected.stderr.1 rename to usr.bin/make/tests/basic/t2/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 b/usr.bin/make/tests/basic/t2/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t2/expected.stdout.1 rename to usr.bin/make/tests/basic/t2/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/usr.bin/make/tests/basic/t2/legacy_test.sh similarity index 77% rename from tools/regression/usr.bin/make/basic/t2/test.t rename to usr.bin/make/tests/basic/t2/legacy_test.sh index f5866bb9c3c..da4c60a168c 100644 --- a/tools/regression/usr.bin/make/basic/t2/test.t +++ b/usr.bin/make/tests/basic/t2/legacy_test.sh @@ -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." diff --git a/tools/regression/usr.bin/make/basic/t3/expected.status.1 b/usr.bin/make/tests/basic/t3/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t3/expected.status.1 rename to usr.bin/make/tests/basic/t3/expected.status.1 diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 b/usr.bin/make/tests/basic/t3/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t3/expected.stderr.1 rename to usr.bin/make/tests/basic/t3/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 b/usr.bin/make/tests/basic/t3/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/basic/t3/expected.stdout.1 rename to usr.bin/make/tests/basic/t3/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/usr.bin/make/tests/basic/t3/legacy_test.sh similarity index 71% rename from tools/regression/usr.bin/make/basic/t3/test.t rename to usr.bin/make/tests/basic/t3/legacy_test.sh index 782d27c59fc..3c41bb373e7 100644 --- a/tools/regression/usr.bin/make/basic/t3/test.t +++ b/usr.bin/make/tests/basic/t3/legacy_test.sh @@ -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." diff --git a/tools/regression/usr.bin/make/common.sh b/usr.bin/make/tests/common.sh similarity index 90% rename from tools/regression/usr.bin/make/common.sh rename to usr.bin/make/tests/common.sh index cc7622e7211..5c5df1e619e 100644 --- a/tools/regression/usr.bin/make/common.sh +++ b/usr.bin/make/tests/common.sh @@ -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 @@ -512,50 +514,17 @@ eval_cmd() # Main code # -# -# 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 # diff --git a/tools/regression/usr.bin/make/execution/ellipsis/Makefile b/usr.bin/make/tests/execution/ellipsis/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/execution/ellipsis/Makefile rename to usr.bin/make/tests/execution/ellipsis/Makefile.test diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 b/usr.bin/make/tests/execution/ellipsis/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 rename to usr.bin/make/tests/execution/ellipsis/expected.status.1 diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 b/usr.bin/make/tests/execution/ellipsis/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 rename to usr.bin/make/tests/execution/ellipsis/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 b/usr.bin/make/tests/execution/ellipsis/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 rename to usr.bin/make/tests/execution/ellipsis/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/execution/ellipsis/test.t b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh similarity index 69% rename from tools/regression/usr.bin/make/execution/ellipsis/test.t rename to usr.bin/make/tests/execution/ellipsis/legacy_test.sh index c042995fd0a..9e9cd01ff29 100644 --- a/tools/regression/usr.bin/make/execution/ellipsis/test.t +++ b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Ellipsis command from variable" diff --git a/tools/regression/usr.bin/make/execution/empty/Makefile b/usr.bin/make/tests/execution/empty/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/execution/empty/Makefile rename to usr.bin/make/tests/execution/empty/Makefile.test diff --git a/tools/regression/usr.bin/make/execution/empty/expected.status.1 b/usr.bin/make/tests/execution/empty/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/empty/expected.status.1 rename to usr.bin/make/tests/execution/empty/expected.status.1 diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 b/usr.bin/make/tests/execution/empty/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/empty/expected.stderr.1 rename to usr.bin/make/tests/execution/empty/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 b/usr.bin/make/tests/execution/empty/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/empty/expected.stdout.1 rename to usr.bin/make/tests/execution/empty/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/execution/empty/test.t b/usr.bin/make/tests/execution/empty/legacy_test.sh similarity index 69% rename from tools/regression/usr.bin/make/execution/empty/test.t rename to usr.bin/make/tests/execution/empty/legacy_test.sh index 433d3427a3d..e02d175b057 100644 --- a/tools/regression/usr.bin/make/execution/empty/test.t +++ b/usr.bin/make/tests/execution/empty/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Empty command (from variable)" diff --git a/tools/regression/usr.bin/make/execution/joberr/Makefile b/usr.bin/make/tests/execution/joberr/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/execution/joberr/Makefile rename to usr.bin/make/tests/execution/joberr/Makefile.test diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.status.1 b/usr.bin/make/tests/execution/joberr/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/joberr/expected.status.1 rename to usr.bin/make/tests/execution/joberr/expected.status.1 diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 b/usr.bin/make/tests/execution/joberr/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 rename to usr.bin/make/tests/execution/joberr/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 b/usr.bin/make/tests/execution/joberr/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 rename to usr.bin/make/tests/execution/joberr/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/execution/joberr/test.t b/usr.bin/make/tests/execution/joberr/legacy_test.sh similarity index 68% rename from tools/regression/usr.bin/make/execution/joberr/test.t rename to usr.bin/make/tests/execution/joberr/legacy_test.sh index 8e07958cb9d..429bfe1d661 100644 --- a/tools/regression/usr.bin/make/execution/joberr/test.t +++ b/usr.bin/make/tests/execution/joberr/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Test job make error output" diff --git a/tools/regression/usr.bin/make/execution/plus/Makefile b/usr.bin/make/tests/execution/plus/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/execution/plus/Makefile rename to usr.bin/make/tests/execution/plus/Makefile.test diff --git a/tools/regression/usr.bin/make/execution/plus/expected.status.1 b/usr.bin/make/tests/execution/plus/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/plus/expected.status.1 rename to usr.bin/make/tests/execution/plus/expected.status.1 diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 b/usr.bin/make/tests/execution/plus/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/plus/expected.stderr.1 rename to usr.bin/make/tests/execution/plus/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 b/usr.bin/make/tests/execution/plus/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/execution/plus/expected.stdout.1 rename to usr.bin/make/tests/execution/plus/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/execution/plus/test.t b/usr.bin/make/tests/execution/plus/legacy_test.sh similarity index 70% rename from tools/regression/usr.bin/make/execution/plus/test.t rename to usr.bin/make/tests/execution/plus/legacy_test.sh index e75b4b9df2a..0737d1bc86b 100644 --- a/tools/regression/usr.bin/make/execution/plus/test.t +++ b/usr.bin/make/tests/execution/plus/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Test '+command' execution with -n -jX" diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/usr.bin/make/tests/shell/builtin/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/Makefile rename to usr.bin/make/tests/shell/builtin/Makefile.test diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 b/usr.bin/make/tests/shell/builtin/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.status.1 rename to usr.bin/make/tests/shell/builtin/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 b/usr.bin/make/tests/shell/builtin/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.status.2 rename to usr.bin/make/tests/shell/builtin/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 b/usr.bin/make/tests/shell/builtin/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 rename to usr.bin/make/tests/shell/builtin/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 b/usr.bin/make/tests/shell/builtin/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 rename to usr.bin/make/tests/shell/builtin/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/usr.bin/make/tests/shell/builtin/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 rename to usr.bin/make/tests/shell/builtin/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/usr.bin/make/tests/shell/builtin/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 rename to usr.bin/make/tests/shell/builtin/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/usr.bin/make/tests/shell/builtin/legacy_test.sh similarity index 82% rename from tools/regression/usr.bin/make/shell/builtin/test.t rename to usr.bin/make/tests/shell/builtin/legacy_test.sh index 1798afcc320..6347583faeb 100644 --- a/tools/regression/usr.bin/make/shell/builtin/test.t +++ b/usr.bin/make/tests/shell/builtin/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Check that a command line with a builtin is passed to the shell." diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/usr.bin/make/tests/shell/builtin/sh similarity index 100% rename from tools/regression/usr.bin/make/shell/builtin/sh rename to usr.bin/make/tests/shell/builtin/sh diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/usr.bin/make/tests/shell/meta/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/Makefile rename to usr.bin/make/tests/shell/meta/Makefile.test diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/usr.bin/make/tests/shell/meta/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.status.1 rename to usr.bin/make/tests/shell/meta/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.2 b/usr.bin/make/tests/shell/meta/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.status.2 rename to usr.bin/make/tests/shell/meta/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 b/usr.bin/make/tests/shell/meta/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.stderr.1 rename to usr.bin/make/tests/shell/meta/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 b/usr.bin/make/tests/shell/meta/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.stderr.2 rename to usr.bin/make/tests/shell/meta/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/usr.bin/make/tests/shell/meta/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.stdout.1 rename to usr.bin/make/tests/shell/meta/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/usr.bin/make/tests/shell/meta/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/expected.stdout.2 rename to usr.bin/make/tests/shell/meta/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/usr.bin/make/tests/shell/meta/legacy_test.sh similarity index 82% rename from tools/regression/usr.bin/make/shell/meta/test.t rename to usr.bin/make/tests/shell/meta/legacy_test.sh index 588b73ccc9f..41cd763fd7d 100644 --- a/tools/regression/usr.bin/make/shell/meta/test.t +++ b/usr.bin/make/tests/shell/meta/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Check that a command line with meta characters is passed to the shell." diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/usr.bin/make/tests/shell/meta/sh similarity index 100% rename from tools/regression/usr.bin/make/shell/meta/sh rename to usr.bin/make/tests/shell/meta/sh diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/usr.bin/make/tests/shell/path/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/shell/path/Makefile rename to usr.bin/make/tests/shell/path/Makefile.test diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/usr.bin/make/tests/shell/path/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.status.1 rename to usr.bin/make/tests/shell/path/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.2 b/usr.bin/make/tests/shell/path/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.status.2 rename to usr.bin/make/tests/shell/path/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 b/usr.bin/make/tests/shell/path/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.stderr.1 rename to usr.bin/make/tests/shell/path/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 b/usr.bin/make/tests/shell/path/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.stderr.2 rename to usr.bin/make/tests/shell/path/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/usr.bin/make/tests/shell/path/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.stdout.1 rename to usr.bin/make/tests/shell/path/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 b/usr.bin/make/tests/shell/path/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path/expected.stdout.2 rename to usr.bin/make/tests/shell/path/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/usr.bin/make/tests/shell/path/legacy_test.sh similarity index 84% rename from tools/regression/usr.bin/make/shell/path/test.t rename to usr.bin/make/tests/shell/path/legacy_test.sh index 72ff252af70..9289a8d2ddd 100644 --- a/tools/regression/usr.bin/make/shell/path/test.t +++ b/usr.bin/make/tests/shell/path/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="New path for builtin shells." diff --git a/tools/regression/usr.bin/make/shell/path/sh b/usr.bin/make/tests/shell/path/sh similarity index 100% rename from tools/regression/usr.bin/make/shell/path/sh rename to usr.bin/make/tests/shell/path/sh diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/usr.bin/make/tests/shell/path_select/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/Makefile rename to usr.bin/make/tests/shell/path_select/Makefile.test diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 b/usr.bin/make/tests/shell/path_select/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.status.1 rename to usr.bin/make/tests/shell/path_select/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 b/usr.bin/make/tests/shell/path_select/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.status.2 rename to usr.bin/make/tests/shell/path_select/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 b/usr.bin/make/tests/shell/path_select/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 rename to usr.bin/make/tests/shell/path_select/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 b/usr.bin/make/tests/shell/path_select/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 rename to usr.bin/make/tests/shell/path_select/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 b/usr.bin/make/tests/shell/path_select/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 rename to usr.bin/make/tests/shell/path_select/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 b/usr.bin/make/tests/shell/path_select/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 rename to usr.bin/make/tests/shell/path_select/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/usr.bin/make/tests/shell/path_select/legacy_test.sh similarity index 82% rename from tools/regression/usr.bin/make/shell/path_select/test.t rename to usr.bin/make/tests/shell/path_select/legacy_test.sh index 5bac6316722..6b75b900e43 100644 --- a/tools/regression/usr.bin/make/shell/path_select/test.t +++ b/usr.bin/make/tests/shell/path_select/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="New path for builtin shells (2)." diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/usr.bin/make/tests/shell/path_select/shell similarity index 100% rename from tools/regression/usr.bin/make/shell/path_select/shell rename to usr.bin/make/tests/shell/path_select/shell diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/usr.bin/make/tests/shell/replace/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/Makefile rename to usr.bin/make/tests/shell/replace/Makefile.test diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/usr.bin/make/tests/shell/replace/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.status.1 rename to usr.bin/make/tests/shell/replace/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.2 b/usr.bin/make/tests/shell/replace/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.status.2 rename to usr.bin/make/tests/shell/replace/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/usr.bin/make/tests/shell/replace/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.stderr.1 rename to usr.bin/make/tests/shell/replace/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/usr.bin/make/tests/shell/replace/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.stderr.2 rename to usr.bin/make/tests/shell/replace/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/usr.bin/make/tests/shell/replace/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.stdout.1 rename to usr.bin/make/tests/shell/replace/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 b/usr.bin/make/tests/shell/replace/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/expected.stdout.2 rename to usr.bin/make/tests/shell/replace/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/usr.bin/make/tests/shell/replace/legacy_test.sh similarity index 77% rename from tools/regression/usr.bin/make/shell/replace/test.t rename to usr.bin/make/tests/shell/replace/legacy_test.sh index 5c91cf9e03e..880ca780d53 100644 --- a/tools/regression/usr.bin/make/shell/replace/test.t +++ b/usr.bin/make/tests/shell/replace/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Check that the shell can be replaced." diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/usr.bin/make/tests/shell/replace/shell similarity index 100% rename from tools/regression/usr.bin/make/shell/replace/shell rename to usr.bin/make/tests/shell/replace/shell diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/usr.bin/make/tests/shell/select/Makefile.test similarity index 89% rename from tools/regression/usr.bin/make/shell/select/Makefile rename to usr.bin/make/tests/shell/select/Makefile.test index e1ff0231c73..74d96e1d445 100644 --- a/tools/regression/usr.bin/make/shell/select/Makefile +++ b/usr.bin/make/tests/shell/select/Makefile.test @@ -25,4 +25,4 @@ ksh_test: print_path .endif print_path: - @ps -opid,command | awk '$$1=='$$$$' { print $$2; }' + @ps -x -opid,command | awk '$$1=='$$$$' { print $$2; }' diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/usr.bin/make/tests/shell/select/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.status.1 rename to usr.bin/make/tests/shell/select/expected.status.1 diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.2 b/usr.bin/make/tests/shell/select/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.status.2 rename to usr.bin/make/tests/shell/select/expected.status.2 diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 b/usr.bin/make/tests/shell/select/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.stderr.1 rename to usr.bin/make/tests/shell/select/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/usr.bin/make/tests/shell/select/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.stderr.2 rename to usr.bin/make/tests/shell/select/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/usr.bin/make/tests/shell/select/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.stdout.1 rename to usr.bin/make/tests/shell/select/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 b/usr.bin/make/tests/shell/select/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/shell/select/expected.stdout.2 rename to usr.bin/make/tests/shell/select/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/usr.bin/make/tests/shell/select/legacy_test.sh similarity index 79% rename from tools/regression/usr.bin/make/shell/select/test.t rename to usr.bin/make/tests/shell/select/legacy_test.sh index 7f73f9b24e2..46d3eafe571 100644 --- a/tools/regression/usr.bin/make/shell/select/test.t +++ b/usr.bin/make/tests/shell/select/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Select the builtin sh shell." diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/usr.bin/make/tests/suffixes/basic/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/suffixes/basic/Makefile rename to usr.bin/make/tests/suffixes/basic/Makefile.test diff --git a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a b/usr.bin/make/tests/suffixes/basic/TEST1.a similarity index 100% rename from tools/regression/usr.bin/make/suffixes/basic/TEST1.a rename to usr.bin/make/tests/suffixes/basic/TEST1.a diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 b/usr.bin/make/tests/suffixes/basic/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/basic/expected.status.1 rename to usr.bin/make/tests/suffixes/basic/expected.status.1 diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 b/usr.bin/make/tests/suffixes/basic/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 rename to usr.bin/make/tests/suffixes/basic/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 b/usr.bin/make/tests/suffixes/basic/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 rename to usr.bin/make/tests/suffixes/basic/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/usr.bin/make/tests/suffixes/basic/legacy_test.sh similarity index 79% rename from tools/regression/usr.bin/make/suffixes/basic/test.t rename to usr.bin/make/tests/suffixes/basic/legacy_test.sh index 0b387c8ce9e..3446bf0f7ab 100644 --- a/tools/regression/usr.bin/make/suffixes/basic/test.t +++ b/usr.bin/make/tests/suffixes/basic/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Basic suffix operation." diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/usr.bin/make/tests/suffixes/src_wild1/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/Makefile rename to usr.bin/make/tests/suffixes/src_wild1/Makefile.test diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a b/usr.bin/make/tests/suffixes/src_wild1/TEST1.a similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a rename to usr.bin/make/tests/suffixes/src_wild1/TEST1.a diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a b/usr.bin/make/tests/suffixes/src_wild1/TEST2.a similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a rename to usr.bin/make/tests/suffixes/src_wild1/TEST2.a diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 rename to usr.bin/make/tests/suffixes/src_wild1/expected.status.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 rename to usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 rename to usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh similarity index 80% rename from tools/regression/usr.bin/make/suffixes/src_wild1/test.t rename to usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh index 6b311183645..053cc6cddd1 100644 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t +++ b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Source wildcard expansion." diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/usr.bin/make/tests/suffixes/src_wild2/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/Makefile rename to usr.bin/make/tests/suffixes/src_wild2/Makefile.test diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a b/usr.bin/make/tests/suffixes/src_wild2/TEST1.a similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a rename to usr.bin/make/tests/suffixes/src_wild2/TEST1.a diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a b/usr.bin/make/tests/suffixes/src_wild2/TEST2.a similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a rename to usr.bin/make/tests/suffixes/src_wild2/TEST2.a diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 rename to usr.bin/make/tests/suffixes/src_wild2/expected.status.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 rename to usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 rename to usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh similarity index 81% rename from tools/regression/usr.bin/make/suffixes/src_wild2/test.t rename to usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh index 0d40e3d1a07..03cff9382af 100644 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t +++ b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Source wildcard expansion (2)." diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/syntax/directive-t0/Makefile rename to usr.bin/make/tests/syntax/directive-t0/Makefile.test diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 b/usr.bin/make/tests/syntax/directive-t0/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 rename to usr.bin/make/tests/syntax/directive-t0/expected.status.1 diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 rename to usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 rename to usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/test.t b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh similarity index 75% rename from tools/regression/usr.bin/make/syntax/directive-t0/test.t rename to usr.bin/make/tests/syntax/directive-t0/legacy_test.sh index 4b71de3f56b..451c8764c25 100644 --- a/tools/regression/usr.bin/make/syntax/directive-t0/test.t +++ b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh @@ -1,8 +1,7 @@ #! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="A typo'ed directive." diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/usr.bin/make/tests/syntax/enl/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/Makefile rename to usr.bin/make/tests/syntax/enl/Makefile.test diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.1 b/usr.bin/make/tests/syntax/enl/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.status.1 rename to usr.bin/make/tests/syntax/enl/expected.status.1 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.2 b/usr.bin/make/tests/syntax/enl/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.status.2 rename to usr.bin/make/tests/syntax/enl/expected.status.2 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.3 b/usr.bin/make/tests/syntax/enl/expected.status.3 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.status.3 rename to usr.bin/make/tests/syntax/enl/expected.status.3 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.4 b/usr.bin/make/tests/syntax/enl/expected.status.4 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.status.4 rename to usr.bin/make/tests/syntax/enl/expected.status.4 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.5 b/usr.bin/make/tests/syntax/enl/expected.status.5 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.status.5 rename to usr.bin/make/tests/syntax/enl/expected.status.5 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 b/usr.bin/make/tests/syntax/enl/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 rename to usr.bin/make/tests/syntax/enl/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 b/usr.bin/make/tests/syntax/enl/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 rename to usr.bin/make/tests/syntax/enl/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 b/usr.bin/make/tests/syntax/enl/expected.stderr.3 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 rename to usr.bin/make/tests/syntax/enl/expected.stderr.3 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 b/usr.bin/make/tests/syntax/enl/expected.stderr.4 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 rename to usr.bin/make/tests/syntax/enl/expected.stderr.4 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 b/usr.bin/make/tests/syntax/enl/expected.stderr.5 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 rename to usr.bin/make/tests/syntax/enl/expected.stderr.5 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 b/usr.bin/make/tests/syntax/enl/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 rename to usr.bin/make/tests/syntax/enl/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 b/usr.bin/make/tests/syntax/enl/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 rename to usr.bin/make/tests/syntax/enl/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 b/usr.bin/make/tests/syntax/enl/expected.stdout.3 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 rename to usr.bin/make/tests/syntax/enl/expected.stdout.3 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 b/usr.bin/make/tests/syntax/enl/expected.stdout.4 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 rename to usr.bin/make/tests/syntax/enl/expected.stdout.4 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 b/usr.bin/make/tests/syntax/enl/expected.stdout.5 similarity index 100% rename from tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 rename to usr.bin/make/tests/syntax/enl/expected.stdout.5 diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/usr.bin/make/tests/syntax/enl/legacy_test.sh similarity index 73% rename from tools/regression/usr.bin/make/syntax/enl/test.t rename to usr.bin/make/tests/syntax/enl/legacy_test.sh index 2e5d12c0335..307c1f02d2f 100644 --- a/tools/regression/usr.bin/make/syntax/enl/test.t +++ b/usr.bin/make/tests/syntax/enl/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Test escaped new-lines handling." diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile b/usr.bin/make/tests/syntax/funny-targets/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/Makefile rename to usr.bin/make/tests/syntax/funny-targets/Makefile.test diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 b/usr.bin/make/tests/syntax/funny-targets/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 rename to usr.bin/make/tests/syntax/funny-targets/expected.status.1 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 b/usr.bin/make/tests/syntax/funny-targets/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 rename to usr.bin/make/tests/syntax/funny-targets/expected.status.2 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 rename to usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 rename to usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 rename to usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 rename to usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/test.t b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh similarity index 70% rename from tools/regression/usr.bin/make/syntax/funny-targets/test.t rename to usr.bin/make/tests/syntax/funny-targets/legacy_test.sh index ec7e75c7a3a..e9cd31701ec 100644 --- a/tools/regression/usr.bin/make/syntax/funny-targets/test.t +++ b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC='Target names with "funny" embeded characters.' diff --git a/tools/regression/usr.bin/make/syntax/semi/Makefile b/usr.bin/make/tests/syntax/semi/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/Makefile rename to usr.bin/make/tests/syntax/semi/Makefile.test diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.1 b/usr.bin/make/tests/syntax/semi/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.status.1 rename to usr.bin/make/tests/syntax/semi/expected.status.1 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.2 b/usr.bin/make/tests/syntax/semi/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.status.2 rename to usr.bin/make/tests/syntax/semi/expected.status.2 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 b/usr.bin/make/tests/syntax/semi/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 rename to usr.bin/make/tests/syntax/semi/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 b/usr.bin/make/tests/syntax/semi/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 rename to usr.bin/make/tests/syntax/semi/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 b/usr.bin/make/tests/syntax/semi/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 rename to usr.bin/make/tests/syntax/semi/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 b/usr.bin/make/tests/syntax/semi/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 rename to usr.bin/make/tests/syntax/semi/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/syntax/semi/test.t b/usr.bin/make/tests/syntax/semi/legacy_test.sh similarity index 71% rename from tools/regression/usr.bin/make/syntax/semi/test.t rename to usr.bin/make/tests/syntax/semi/legacy_test.sh index f52c9ab9ead..092635a8495 100644 --- a/tools/regression/usr.bin/make/syntax/semi/test.t +++ b/usr.bin/make/tests/syntax/semi/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Test semicolon handling." diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile b/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile rename to usr.bin/make/tests/sysmk/t0/2/1/Makefile.test diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 rename to usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 rename to usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 rename to usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh similarity index 79% rename from tools/regression/usr.bin/make/sysmk/t0/2/1/test.t rename to usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh index 9a781570fd1..0214842f48e 100644 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t +++ b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../../../common.sh +. $(dirname $0)/../../../../common.sh # Description DESC="Can we traverse up to / and find a 'mk/sys.mk'?" diff --git a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk b/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk rename to usr.bin/make/tests/sysmk/t0/mk/sys.mk.test diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup b/usr.bin/make/tests/sysmk/t1/2/1/cleanup similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup rename to usr.bin/make/tests/sysmk/t1/2/1/cleanup diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 rename to usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 rename to usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 rename to usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh similarity index 81% rename from tools/regression/usr.bin/make/sysmk/t1/2/1/test.t rename to usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh index ad1584f82d1..fb738516283 100644 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t +++ b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../../../common.sh +. $(dirname $0)/../../../../common.sh # Description DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?" @@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?" TEST_N=1 TEST_1="-C ../../../t0/2/1 -m .../mk" TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755" -TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644" +TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644" TEST_CLEAN_FILES="../../../t0/2/1" TEST_CLEANUP=clean-special diff --git a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk b/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk rename to usr.bin/make/tests/sysmk/t1/mk/sys.mk.test diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup b/usr.bin/make/tests/sysmk/t2/2/1/cleanup similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup rename to usr.bin/make/tests/sysmk/t2/2/1/cleanup diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 rename to usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 rename to usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 rename to usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh similarity index 81% rename from tools/regression/usr.bin/make/sysmk/t2/2/1/test.t rename to usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh index 2c4dff35bde..ca817d8098d 100644 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t +++ b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../../../common.sh +. $(dirname $0)/../../../../common.sh # Description DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?" @@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?" TEST_N=1 TEST_1="-m .../mk -C ../../../t0/2/1" TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755" -TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644" +TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644" TEST_CLEAN_FILES="../../../t0/2/1" TEST_CLEANUP=clean-special diff --git a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk b/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test similarity index 100% rename from tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk rename to usr.bin/make/tests/sysmk/t2/mk/sys.mk.test diff --git a/tools/regression/usr.bin/make/test-new.mk b/usr.bin/make/tests/test-new.mk similarity index 100% rename from tools/regression/usr.bin/make/test-new.mk rename to usr.bin/make/tests/test-new.mk diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_M/Makefile rename to usr.bin/make/tests/variables/modifier_M/Makefile.test diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 b/usr.bin/make/tests/variables/modifier_M/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 rename to usr.bin/make/tests/variables/modifier_M/expected.status.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_M/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 rename to usr.bin/make/tests/variables/modifier_M/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_M/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 rename to usr.bin/make/tests/variables/modifier_M/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh similarity index 64% rename from tools/regression/usr.bin/make/variables/modifier_M/test.t rename to usr.bin/make/tests/variables/modifier_M/legacy_test.sh index 979778f12e9..6a3e68ff575 100644 --- a/tools/regression/usr.bin/make/variables/modifier_M/test.t +++ b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Variable expansion with M modifier" diff --git a/tools/regression/usr.bin/make/variables/modifier_t/Makefile b/usr.bin/make/tests/variables/modifier_t/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/Makefile rename to usr.bin/make/tests/variables/modifier_t/Makefile.test diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 b/usr.bin/make/tests/variables/modifier_t/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 rename to usr.bin/make/tests/variables/modifier_t/expected.status.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 b/usr.bin/make/tests/variables/modifier_t/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 rename to usr.bin/make/tests/variables/modifier_t/expected.status.2 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 b/usr.bin/make/tests/variables/modifier_t/expected.status.3 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 rename to usr.bin/make/tests/variables/modifier_t/expected.status.3 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 rename to usr.bin/make/tests/variables/modifier_t/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 rename to usr.bin/make/tests/variables/modifier_t/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.3 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 rename to usr.bin/make/tests/variables/modifier_t/expected.stderr.3 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 rename to usr.bin/make/tests/variables/modifier_t/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 rename to usr.bin/make/tests/variables/modifier_t/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.3 similarity index 100% rename from tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 rename to usr.bin/make/tests/variables/modifier_t/expected.stdout.3 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/test.t b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh similarity index 68% rename from tools/regression/usr.bin/make/variables/modifier_t/test.t rename to usr.bin/make/tests/variables/modifier_t/legacy_test.sh index f564f6ea991..7f145718b6d 100644 --- a/tools/regression/usr.bin/make/variables/modifier_t/test.t +++ b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Variable expansion with t modifiers" diff --git a/tools/regression/usr.bin/make/variables/opt_V/Makefile b/usr.bin/make/tests/variables/opt_V/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/Makefile rename to usr.bin/make/tests/variables/opt_V/Makefile.test diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 b/usr.bin/make/tests/variables/opt_V/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.status.1 rename to usr.bin/make/tests/variables/opt_V/expected.status.1 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 b/usr.bin/make/tests/variables/opt_V/expected.status.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.status.2 rename to usr.bin/make/tests/variables/opt_V/expected.status.2 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 b/usr.bin/make/tests/variables/opt_V/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 rename to usr.bin/make/tests/variables/opt_V/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 b/usr.bin/make/tests/variables/opt_V/expected.stderr.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 rename to usr.bin/make/tests/variables/opt_V/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 b/usr.bin/make/tests/variables/opt_V/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 rename to usr.bin/make/tests/variables/opt_V/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 b/usr.bin/make/tests/variables/opt_V/expected.stdout.2 similarity index 100% rename from tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 rename to usr.bin/make/tests/variables/opt_V/expected.stdout.2 diff --git a/tools/regression/usr.bin/make/variables/opt_V/test.t b/usr.bin/make/tests/variables/opt_V/legacy_test.sh similarity index 70% rename from tools/regression/usr.bin/make/variables/opt_V/test.t rename to usr.bin/make/tests/variables/opt_V/legacy_test.sh index 32a74b6c4a9..4b1122acac8 100644 --- a/tools/regression/usr.bin/make/variables/opt_V/test.t +++ b/usr.bin/make/tests/variables/opt_V/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Variable expansion using command line '-V'" diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/usr.bin/make/tests/variables/t0/Makefile.test similarity index 100% rename from tools/regression/usr.bin/make/variables/t0/Makefile rename to usr.bin/make/tests/variables/t0/Makefile.test diff --git a/tools/regression/usr.bin/make/variables/t0/expected.status.1 b/usr.bin/make/tests/variables/t0/expected.status.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/t0/expected.status.1 rename to usr.bin/make/tests/variables/t0/expected.status.1 diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 b/usr.bin/make/tests/variables/t0/expected.stderr.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/t0/expected.stderr.1 rename to usr.bin/make/tests/variables/t0/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 b/usr.bin/make/tests/variables/t0/expected.stdout.1 similarity index 100% rename from tools/regression/usr.bin/make/variables/t0/expected.stdout.1 rename to usr.bin/make/tests/variables/t0/expected.stdout.1 diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/usr.bin/make/tests/variables/t0/legacy_test.sh similarity index 60% rename from tools/regression/usr.bin/make/variables/t0/test.t rename to usr.bin/make/tests/variables/t0/legacy_test.sh index 7e4f42729d2..8c78e2d0825 100644 --- a/tools/regression/usr.bin/make/variables/t0/test.t +++ b/usr.bin/make/tests/variables/t0/legacy_test.sh @@ -1,9 +1,7 @@ -#!/bin/sh - +#! /bin/sh # $FreeBSD$ -cd `dirname $0` -. ../../common.sh +. $(dirname $0)/../../common.sh # Description DESC="Variable expansion."