From 18ab67e34bde94ef47bc217c226acd64fbe3f87f Mon Sep 17 00:00:00 2001 From: ngie Date: Tue, 30 Dec 2014 02:32:48 +0000 Subject: [PATCH] MFC r266074,r266104,r266147: r266074: Move old fmake tests into bmake and hook them to the build. This first step is mostly to prevent the code from rotting even further and to ensure these do not get wiped when fmake's code is removed from the tree. These tests are currently being skipped because they detect the underlying make is not fmake and thus disable themselves -- and the reason is that some of the tests fail, possibly due to legitimate bugs. Enabling them to run against bmake will come separately. Lastly, it would be ideal if these tests were fed upstream but they are not ready for that yet. In the interim, just put them under usr.bin/bmake/ while we sort things out. The existence of a different unit-tests directory within here makes me feel less guilty about this. Change confirmed working with a clean amd64 build. r266104: Undo changes to the generated Makefile. Move tests directory to proper location, including updating the test to work in the more-fragile fmake -> bmake bootstrap environment. r266147: Makefile.inc is also included by the tests subdirectory, which results in SUBDIRS having tests added to it, which fails. Work around this by checking to make sure tests exists before adding it to subdirs and work to get the generated file fixed so we can rename Makefile.inc to something else so it isn't automatically included by subdirs... git-svn-id: svn://svn.freebsd.org/base/stable/10@276389 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/mtree/BSD.tests.dist | 30 +++++++++--------- usr.bin/bmake/Makefile | 1 - usr.bin/bmake/Makefile.inc | 7 ++++ usr.bin/{make => bmake}/tests/Makefile | 2 +- usr.bin/{make => bmake}/tests/README | 0 .../{make => bmake}/tests/archives/Makefile | 2 +- .../tests/archives/fmt_44bsd}/Makefile | 2 +- .../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 | 0 .../tests/archives/fmt_44bsd/libtest.a | Bin .../tests/archives/fmt_44bsd_mod/Makefile | 2 +- .../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 | 0 .../tests/archives/fmt_44bsd_mod/libtest.a | Bin .../tests/archives/fmt_oldbsd}/Makefile | 2 +- .../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 | 0 .../tests/archives/fmt_oldbsd/libtest.a | Bin usr.bin/{make => bmake}/tests/basic/Makefile | 2 +- .../t3 => bmake/tests/basic/t0}/Makefile | 2 +- .../tests/basic/t0/expected.status.1 | 0 .../tests/basic/t0/expected.stderr.1 | 0 .../tests/basic/t0/expected.stdout.1 | 0 .../tests/basic/t0/legacy_test.sh | 0 .../t2 => bmake/tests/basic/t1}/Makefile | 2 +- .../tests/basic/t1/Makefile.test | 0 .../tests/basic/t1/expected.status.1 | 0 .../tests/basic/t1/expected.stderr.1 | 0 .../tests/basic/t1/expected.stdout.1 | 0 .../tests/basic/t1/legacy_test.sh | 0 .../t1 => bmake/tests/basic/t2}/Makefile | 2 +- .../tests/basic/t2/Makefile.test | 0 .../tests/basic/t2/expected.status.1 | 0 .../tests/basic/t2/expected.stderr.1 | 0 .../tests/basic/t2/expected.stdout.1 | 0 .../tests/basic/t2/legacy_test.sh | 0 .../t0 => bmake/tests/basic/t3}/Makefile | 2 +- .../tests/basic/t3/expected.status.1 | 0 .../tests/basic/t3/expected.stderr.1 | 0 .../tests/basic/t3/expected.stdout.1 | 0 .../tests/basic/t3/legacy_test.sh | 0 usr.bin/{make => bmake}/tests/common.sh | 0 .../{make => bmake}/tests/execution/Makefile | 2 +- .../tests/execution/ellipsis/Makefile | 2 +- .../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 | 0 .../tests/execution/empty}/Makefile | 2 +- .../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 .../tests/execution/empty/legacy_test.sh | 0 .../tests/execution/joberr}/Makefile | 2 +- .../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 | 0 .../tests/execution/plus/Makefile | 2 +- .../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 .../tests/execution/plus/legacy_test.sh | 0 usr.bin/{make => bmake}/tests/shell/Makefile | 2 +- .../tests/shell/builtin/Makefile | 2 +- .../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 .../tests/shell/builtin/legacy_test.sh | 0 .../{make => bmake}/tests/shell/builtin/sh | 0 .../{make => bmake}/tests/shell/meta/Makefile | 2 +- .../tests/shell/meta/Makefile.test | 0 .../tests/shell/meta/expected.status.1 | 0 .../tests/shell/meta/expected.status.2 | 0 .../tests/shell/meta/expected.stderr.1 | 0 .../tests/shell/meta/expected.stderr.2 | 0 .../tests/shell/meta/expected.stdout.1 | 0 .../tests/shell/meta/expected.stdout.2 | 0 .../tests/shell/meta/legacy_test.sh | 0 usr.bin/{make => bmake}/tests/shell/meta/sh | 0 .../{make => bmake}/tests/shell/path/Makefile | 2 +- .../tests/shell/path/Makefile.test | 0 .../tests/shell/path/expected.status.1 | 0 .../tests/shell/path/expected.status.2 | 0 .../tests/shell/path/expected.stderr.1 | 0 .../tests/shell/path/expected.stderr.2 | 0 .../tests/shell/path/expected.stdout.1 | 0 .../tests/shell/path/expected.stdout.2 | 0 .../tests/shell/path/legacy_test.sh | 0 usr.bin/{make => bmake}/tests/shell/path/sh | 0 .../tests/shell/path_select/Makefile | 2 +- .../tests/shell/path_select/Makefile.test | 0 .../tests/shell/path_select/expected.status.1 | 0 .../tests/shell/path_select/expected.status.2 | 0 .../tests/shell/path_select/expected.stderr.1 | 0 .../tests/shell/path_select/expected.stderr.2 | 0 .../tests/shell/path_select/expected.stdout.1 | 0 .../tests/shell/path_select/expected.stdout.2 | 0 .../tests/shell/path_select/legacy_test.sh | 0 .../tests/shell/path_select/shell | 0 .../tests/shell/replace/Makefile | 2 +- .../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 .../tests/shell/replace/legacy_test.sh | 0 .../{make => bmake}/tests/shell/replace/shell | 0 .../tests/shell/select/Makefile | 2 +- .../tests/shell/select/Makefile.test | 0 .../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 .../tests/shell/select/legacy_test.sh | 0 .../{make => bmake}/tests/suffixes/Makefile | 2 +- .../tests/suffixes/basic/Makefile | 2 +- .../tests/suffixes/basic/Makefile.test | 0 .../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 .../tests/suffixes/basic/legacy_test.sh | 0 .../tests/suffixes/src_wild1/Makefile | 2 +- .../tests/suffixes/src_wild1/Makefile.test | 0 .../tests/suffixes/src_wild1/TEST1.a | 0 .../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 | 0 .../tests/suffixes/src_wild2/Makefile | 2 +- .../tests/suffixes/src_wild2/Makefile.test | 0 .../tests/suffixes/src_wild2/TEST1.a | 0 .../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 | 0 usr.bin/{make => bmake}/tests/syntax/Makefile | 2 +- .../bmake/tests/syntax/directive-t0/Makefile | 13 ++++++++ .../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 | 0 .../{make => bmake}/tests/syntax/enl/Makefile | 2 +- .../tests/syntax/enl/Makefile.test | 0 .../tests/syntax/enl/expected.status.1 | 0 .../tests/syntax/enl/expected.status.2 | 0 .../tests/syntax/enl/expected.status.3 | 0 .../tests/syntax/enl/expected.status.4 | 0 .../tests/syntax/enl/expected.status.5 | 0 .../tests/syntax/enl/expected.stderr.1 | 0 .../tests/syntax/enl/expected.stderr.2 | 0 .../tests/syntax/enl/expected.stderr.3 | 0 .../tests/syntax/enl/expected.stderr.4 | 0 .../tests/syntax/enl/expected.stderr.5 | 0 .../tests/syntax/enl/expected.stdout.1 | 0 .../tests/syntax/enl/expected.stdout.2 | 0 .../tests/syntax/enl/expected.stdout.3 | 0 .../tests/syntax/enl/expected.stdout.4 | 0 .../tests/syntax/enl/expected.stdout.5 | 0 .../tests/syntax/enl/legacy_test.sh | 0 .../tests/syntax/funny-targets/Makefile | 2 +- .../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 | 0 .../tests/syntax/semi/Makefile | 2 +- .../tests/syntax/semi/Makefile.test | 0 .../tests/syntax/semi/expected.status.1 | 0 .../tests/syntax/semi/expected.status.2 | 0 .../tests/syntax/semi/expected.stderr.1 | 0 .../tests/syntax/semi/expected.stderr.2 | 0 .../tests/syntax/semi/expected.stdout.1 | 0 .../tests/syntax/semi/expected.stdout.2 | 0 .../tests/syntax/semi/legacy_test.sh | 0 usr.bin/{make => bmake}/tests/sysmk/Makefile | 2 +- .../t0 => bmake/tests/sysmk/t0/2/1}/Makefile | 2 +- .../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 .../tests/sysmk/t0/2/1/legacy_test.sh | 0 .../t2 => bmake/tests/sysmk/t0}/2/Makefile | 2 +- .../t1 => bmake/tests/sysmk/t0}/Makefile | 2 +- .../tests/sysmk/t0/mk/Makefile | 2 +- .../tests/sysmk/t0/mk/sys.mk.test | 0 .../tests/sysmk/t1/2/1/Makefile | 2 +- .../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 .../tests/sysmk/t1/2/1/legacy_test.sh | 0 .../t0 => bmake/tests/sysmk/t1}/2/Makefile | 2 +- .../t2 => bmake/tests/sysmk/t1}/Makefile | 2 +- .../tests/sysmk/t1/mk/Makefile | 2 +- .../tests/sysmk/t1/mk/sys.mk.test | 0 .../tests/sysmk/t2/2/1/Makefile | 2 +- .../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 .../tests/sysmk/t2/2/1/legacy_test.sh | 0 .../t1 => bmake/tests/sysmk/t2}/2/Makefile | 2 +- .../t0 => bmake/tests/sysmk/t2}/Makefile | 2 +- .../tests/sysmk/t2/mk/Makefile | 2 +- .../tests/sysmk/t2/mk/sys.mk.test | 0 usr.bin/{make => bmake}/tests/test-new.mk | 0 .../{make => bmake}/tests/variables/Makefile | 2 +- .../bmake/tests/variables/modifier_M/Makefile | 13 ++++++++ .../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 | 0 .../tests/variables/modifier_t/Makefile | 2 +- .../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 | 0 .../tests/variables/opt_V/Makefile | 2 +- .../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 .../tests/variables/opt_V/legacy_test.sh | 0 .../2/1 => bmake/tests/variables/t0}/Makefile | 2 +- .../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 .../tests/variables/t0/legacy_test.sh | 0 usr.bin/make/Makefile | 4 --- .../make/tests/syntax/directive-t0/Makefile | 13 -------- .../make/tests/variables/modifier_M/Makefile | 13 -------- 326 files changed, 95 insertions(+), 93 deletions(-) rename usr.bin/{make => bmake}/tests/Makefile (88%) rename usr.bin/{make => bmake}/tests/README (100%) rename usr.bin/{make => bmake}/tests/archives/Makefile (65%) rename usr.bin/{make/tests/archives/fmt_oldbsd => bmake/tests/archives/fmt_44bsd}/Makefile (92%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.status.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stderr.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/expected.stdout.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd/libtest.a (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/Makefile (92%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.status.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stderr.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/expected.stdout.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_44bsd_mod/libtest.a (100%) rename usr.bin/{make/tests/archives/fmt_44bsd => bmake/tests/archives/fmt_oldbsd}/Makefile (92%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.status.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stderr.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.3 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.4 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.5 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.6 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/expected.stdout.7 (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/archives/fmt_oldbsd/libtest.a (100%) rename usr.bin/{make => bmake}/tests/basic/Makefile (60%) rename usr.bin/{make/tests/basic/t3 => bmake/tests/basic/t0}/Makefile (78%) rename usr.bin/{make => bmake}/tests/basic/t0/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t0/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t0/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t0/legacy_test.sh (100%) rename usr.bin/{make/tests/basic/t2 => bmake/tests/basic/t1}/Makefile (80%) rename usr.bin/{make => bmake}/tests/basic/t1/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/basic/t1/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t1/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t1/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t1/legacy_test.sh (100%) rename usr.bin/{make/tests/basic/t1 => bmake/tests/basic/t2}/Makefile (80%) rename usr.bin/{make => bmake}/tests/basic/t2/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/basic/t2/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t2/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t2/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t2/legacy_test.sh (100%) rename usr.bin/{make/tests/basic/t0 => bmake/tests/basic/t3}/Makefile (78%) rename usr.bin/{make => bmake}/tests/basic/t3/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t3/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t3/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/basic/t3/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/common.sh (100%) rename usr.bin/{make => bmake}/tests/execution/Makefile (62%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/Makefile (77%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/execution/ellipsis/legacy_test.sh (100%) rename usr.bin/{make/tests/execution/joberr => bmake/tests/execution/empty}/Makefile (78%) rename usr.bin/{make => bmake}/tests/execution/empty/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/execution/empty/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/execution/empty/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/execution/empty/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/execution/empty/legacy_test.sh (100%) rename usr.bin/{make/tests/execution/empty => bmake/tests/execution/joberr}/Makefile (77%) rename usr.bin/{make => bmake}/tests/execution/joberr/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/execution/joberr/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/execution/joberr/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/execution/joberr/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/execution/joberr/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/execution/plus/Makefile (78%) rename usr.bin/{make => bmake}/tests/execution/plus/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/execution/plus/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/execution/plus/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/execution/plus/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/execution/plus/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/Makefile (69%) rename usr.bin/{make => bmake}/tests/shell/builtin/Makefile (84%) rename usr.bin/{make => bmake}/tests/shell/builtin/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/builtin/sh (100%) rename usr.bin/{make => bmake}/tests/shell/meta/Makefile (85%) rename usr.bin/{make => bmake}/tests/shell/meta/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/meta/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/meta/sh (100%) rename usr.bin/{make => bmake}/tests/shell/path/Makefile (85%) rename usr.bin/{make => bmake}/tests/shell/path/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/path/sh (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/Makefile (83%) rename usr.bin/{make => bmake}/tests/shell/path_select/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/path_select/shell (100%) rename usr.bin/{make => bmake}/tests/shell/replace/Makefile (84%) rename usr.bin/{make => bmake}/tests/shell/replace/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/replace/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/shell/replace/shell (100%) rename usr.bin/{make => bmake}/tests/shell/select/Makefile (84%) rename usr.bin/{make => bmake}/tests/shell/select/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/shell/select/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/shell/select/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/suffixes/Makefile (63%) rename usr.bin/{make => bmake}/tests/suffixes/basic/Makefile (79%) rename usr.bin/{make => bmake}/tests/suffixes/basic/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/suffixes/basic/TEST1.a (100%) rename usr.bin/{make => bmake}/tests/suffixes/basic/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/basic/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/basic/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/basic/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/Makefile (80%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/TEST1.a (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/TEST2.a (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild1/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/Makefile (80%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/TEST1.a (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/TEST2.a (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/suffixes/src_wild2/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/syntax/Makefile (66%) create mode 100644 usr.bin/bmake/tests/syntax/directive-t0/Makefile rename usr.bin/{make => bmake}/tests/syntax/directive-t0/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/syntax/directive-t0/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/directive-t0/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/directive-t0/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/directive-t0/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/Makefile (91%) rename usr.bin/{make => bmake}/tests/syntax/enl/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.status.3 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.status.4 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.status.5 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stderr.3 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stderr.4 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stderr.5 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stdout.3 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stdout.4 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/expected.stdout.5 (100%) rename usr.bin/{make => bmake}/tests/syntax/enl/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/Makefile (82%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/funny-targets/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/Makefile (84%) rename usr.bin/{make => bmake}/tests/syntax/semi/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/syntax/semi/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/sysmk/Makefile (59%) rename usr.bin/{make/tests/variables/t0 => bmake/tests/sysmk/t0/2/1}/Makefile (79%) rename usr.bin/{make => bmake}/tests/sysmk/t0/2/1/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/sysmk/t0/2/1/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t0/2/1/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t0/2/1/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t0/2/1/legacy_test.sh (100%) rename usr.bin/{make/tests/sysmk/t2 => bmake/tests/sysmk/t0}/2/Makefile (53%) rename usr.bin/{make/tests/sysmk/t1 => bmake/tests/sysmk/t0}/Makefile (59%) rename usr.bin/{make => bmake}/tests/sysmk/t0/mk/Makefile (69%) rename usr.bin/{make => bmake}/tests/sysmk/t0/mk/sys.mk.test (100%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/Makefile (78%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/cleanup (100%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t1/2/1/legacy_test.sh (100%) rename usr.bin/{make/tests/sysmk/t0 => bmake/tests/sysmk/t1}/2/Makefile (53%) rename usr.bin/{make/tests/sysmk/t2 => bmake/tests/sysmk/t1}/Makefile (59%) rename usr.bin/{make => bmake}/tests/sysmk/t1/mk/Makefile (69%) rename usr.bin/{make => bmake}/tests/sysmk/t1/mk/sys.mk.test (100%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/Makefile (78%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/cleanup (100%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/sysmk/t2/2/1/legacy_test.sh (100%) rename usr.bin/{make/tests/sysmk/t1 => bmake/tests/sysmk/t2}/2/Makefile (53%) rename usr.bin/{make/tests/sysmk/t0 => bmake/tests/sysmk/t2}/Makefile (59%) rename usr.bin/{make => bmake}/tests/sysmk/t2/mk/Makefile (69%) rename usr.bin/{make => bmake}/tests/sysmk/t2/mk/sys.mk.test (100%) rename usr.bin/{make => bmake}/tests/test-new.mk (100%) rename usr.bin/{make => bmake}/tests/variables/Makefile (64%) create mode 100644 usr.bin/bmake/tests/variables/modifier_M/Makefile rename usr.bin/{make => bmake}/tests/variables/modifier_M/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_M/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_M/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_M/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_M/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/Makefile (85%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.status.3 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stderr.3 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/expected.stdout.3 (100%) rename usr.bin/{make => bmake}/tests/variables/modifier_t/legacy_test.sh (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/Makefile (83%) rename usr.bin/{make => bmake}/tests/variables/opt_V/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.status.2 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.stderr.2 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/expected.stdout.2 (100%) rename usr.bin/{make => bmake}/tests/variables/opt_V/legacy_test.sh (100%) rename usr.bin/{make/tests/sysmk/t0/2/1 => bmake/tests/variables/t0}/Makefile (79%) rename usr.bin/{make => bmake}/tests/variables/t0/Makefile.test (100%) rename usr.bin/{make => bmake}/tests/variables/t0/expected.status.1 (100%) rename usr.bin/{make => bmake}/tests/variables/t0/expected.stderr.1 (100%) rename usr.bin/{make => bmake}/tests/variables/t0/expected.stdout.1 (100%) rename usr.bin/{make => bmake}/tests/variables/t0/legacy_test.sh (100%) delete mode 100644 usr.bin/make/tests/syntax/directive-t0/Makefile delete mode 100644 usr.bin/make/tests/variables/modifier_M/Makefile diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 3861f3d23..7bdce044a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -169,21 +169,7 @@ usr.bin apply .. - calendar - .. - comm - .. - file2c - .. - join - .. - jot - .. - lastcomm - .. - m4 - .. - make + bmake archives fmt_44bsd .. @@ -281,6 +267,20 @@ .. .. .. + calendar + .. + comm + .. + file2c + .. + join + .. + jot + .. + lastcomm + .. + m4 + .. ncal .. printf diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index c693713d9..9f52d1c2c 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -106,7 +106,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} SUBDIR+= unit-tests .endif - MAN= ${PROG}.1 MAN1= ${MAN} diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 75678878d..61ccb8e00 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -21,5 +21,12 @@ PROG= make NO_SHARED?= YES .endif +# hack to not add tests to tests subdir since this is included from +# there and to avoid renaming things that require changes to generated +# files. +.if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests) +SUBDIR+= tests +.endif + WARNS=3 CFLAGS+= -DNO_PWD_OVERRIDE diff --git a/usr.bin/make/tests/Makefile b/usr.bin/bmake/tests/Makefile similarity index 88% rename from usr.bin/make/tests/Makefile rename to usr.bin/bmake/tests/Makefile index d5bad60c7..e22503467 100644 --- a/usr.bin/make/tests/Makefile +++ b/usr.bin/bmake/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make +TESTSDIR= ${TESTSBASE}/usr.bin/bmake FILESDIR= ${TESTSDIR} FILES= common.sh diff --git a/usr.bin/make/tests/README b/usr.bin/bmake/tests/README similarity index 100% rename from usr.bin/make/tests/README rename to usr.bin/bmake/tests/README diff --git a/usr.bin/make/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile similarity index 65% rename from usr.bin/make/tests/archives/Makefile rename to usr.bin/bmake/tests/archives/Makefile index f8944e0df..f80ffc2e8 100644 --- a/usr.bin/make/tests/archives/Makefile +++ b/usr.bin/bmake/tests/archives/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/archives +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives TESTS_SUBDIRS= fmt_44bsd fmt_44bsd_mod fmt_oldbsd diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile similarity index 92% rename from usr.bin/make/tests/archives/fmt_oldbsd/Makefile rename to usr.bin/bmake/tests/archives/fmt_44bsd/Makefile index ab1c38363..15389c802 100644 --- a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/Makefile.test rename to usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh rename to usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh diff --git a/usr.bin/make/tests/archives/fmt_44bsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd/libtest.a rename to usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile similarity index 92% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile index 8d63b6415..1d2f6e272 100644 --- a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7 diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a similarity index 100% rename from usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a rename to usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile similarity index 92% rename from usr.bin/make/tests/archives/fmt_44bsd/Makefile rename to usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile index bf6ad4096..2a9612419 100644 --- a/usr.bin/make/tests/archives/fmt_44bsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/archives/fmt_44bsd +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test rename to usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7 similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 rename to usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7 diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh rename to usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a similarity index 100% rename from usr.bin/make/tests/archives/fmt_oldbsd/libtest.a rename to usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a diff --git a/usr.bin/make/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile similarity index 60% rename from usr.bin/make/tests/basic/Makefile rename to usr.bin/bmake/tests/basic/Makefile index fd7044e4d..56dfb3390 100644 --- a/usr.bin/make/tests/basic/Makefile +++ b/usr.bin/bmake/tests/basic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/basic +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic TESTS_SUBDIRS= t0 t1 t2 t3 diff --git a/usr.bin/make/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile similarity index 78% rename from usr.bin/make/tests/basic/t3/Makefile rename to usr.bin/bmake/tests/basic/t0/Makefile index 00c37570b..12356596e 100644 --- a/usr.bin/make/tests/basic/t3/Makefile +++ b/usr.bin/bmake/tests/basic/t0/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/basic/t3 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t0 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/basic/t0/expected.status.1 b/usr.bin/bmake/tests/basic/t0/expected.status.1 similarity index 100% rename from usr.bin/make/tests/basic/t0/expected.status.1 rename to usr.bin/bmake/tests/basic/t0/expected.status.1 diff --git a/usr.bin/make/tests/basic/t0/expected.stderr.1 b/usr.bin/bmake/tests/basic/t0/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/basic/t0/expected.stderr.1 rename to usr.bin/bmake/tests/basic/t0/expected.stderr.1 diff --git a/usr.bin/make/tests/basic/t0/expected.stdout.1 b/usr.bin/bmake/tests/basic/t0/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/basic/t0/expected.stdout.1 rename to usr.bin/bmake/tests/basic/t0/expected.stdout.1 diff --git a/usr.bin/make/tests/basic/t0/legacy_test.sh b/usr.bin/bmake/tests/basic/t0/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/basic/t0/legacy_test.sh rename to usr.bin/bmake/tests/basic/t0/legacy_test.sh diff --git a/usr.bin/make/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile similarity index 80% rename from usr.bin/make/tests/basic/t2/Makefile rename to usr.bin/bmake/tests/basic/t1/Makefile index 4b598ea78..732dc65d9 100644 --- a/usr.bin/make/tests/basic/t2/Makefile +++ b/usr.bin/bmake/tests/basic/t1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/basic/t2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t1 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/basic/t1/Makefile.test b/usr.bin/bmake/tests/basic/t1/Makefile.test similarity index 100% rename from usr.bin/make/tests/basic/t1/Makefile.test rename to usr.bin/bmake/tests/basic/t1/Makefile.test diff --git a/usr.bin/make/tests/basic/t1/expected.status.1 b/usr.bin/bmake/tests/basic/t1/expected.status.1 similarity index 100% rename from usr.bin/make/tests/basic/t1/expected.status.1 rename to usr.bin/bmake/tests/basic/t1/expected.status.1 diff --git a/usr.bin/make/tests/basic/t1/expected.stderr.1 b/usr.bin/bmake/tests/basic/t1/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/basic/t1/expected.stderr.1 rename to usr.bin/bmake/tests/basic/t1/expected.stderr.1 diff --git a/usr.bin/make/tests/basic/t1/expected.stdout.1 b/usr.bin/bmake/tests/basic/t1/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/basic/t1/expected.stdout.1 rename to usr.bin/bmake/tests/basic/t1/expected.stdout.1 diff --git a/usr.bin/make/tests/basic/t1/legacy_test.sh b/usr.bin/bmake/tests/basic/t1/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/basic/t1/legacy_test.sh rename to usr.bin/bmake/tests/basic/t1/legacy_test.sh diff --git a/usr.bin/make/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile similarity index 80% rename from usr.bin/make/tests/basic/t1/Makefile rename to usr.bin/bmake/tests/basic/t2/Makefile index efd9030df..58c36ff96 100644 --- a/usr.bin/make/tests/basic/t1/Makefile +++ b/usr.bin/bmake/tests/basic/t2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/basic/t1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t2 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/basic/t2/Makefile.test b/usr.bin/bmake/tests/basic/t2/Makefile.test similarity index 100% rename from usr.bin/make/tests/basic/t2/Makefile.test rename to usr.bin/bmake/tests/basic/t2/Makefile.test diff --git a/usr.bin/make/tests/basic/t2/expected.status.1 b/usr.bin/bmake/tests/basic/t2/expected.status.1 similarity index 100% rename from usr.bin/make/tests/basic/t2/expected.status.1 rename to usr.bin/bmake/tests/basic/t2/expected.status.1 diff --git a/usr.bin/make/tests/basic/t2/expected.stderr.1 b/usr.bin/bmake/tests/basic/t2/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/basic/t2/expected.stderr.1 rename to usr.bin/bmake/tests/basic/t2/expected.stderr.1 diff --git a/usr.bin/make/tests/basic/t2/expected.stdout.1 b/usr.bin/bmake/tests/basic/t2/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/basic/t2/expected.stdout.1 rename to usr.bin/bmake/tests/basic/t2/expected.stdout.1 diff --git a/usr.bin/make/tests/basic/t2/legacy_test.sh b/usr.bin/bmake/tests/basic/t2/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/basic/t2/legacy_test.sh rename to usr.bin/bmake/tests/basic/t2/legacy_test.sh diff --git a/usr.bin/make/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile similarity index 78% rename from usr.bin/make/tests/basic/t0/Makefile rename to usr.bin/bmake/tests/basic/t3/Makefile index ef390dd95..a17341458 100644 --- a/usr.bin/make/tests/basic/t0/Makefile +++ b/usr.bin/bmake/tests/basic/t3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/basic/t0 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t3 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/basic/t3/expected.status.1 b/usr.bin/bmake/tests/basic/t3/expected.status.1 similarity index 100% rename from usr.bin/make/tests/basic/t3/expected.status.1 rename to usr.bin/bmake/tests/basic/t3/expected.status.1 diff --git a/usr.bin/make/tests/basic/t3/expected.stderr.1 b/usr.bin/bmake/tests/basic/t3/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/basic/t3/expected.stderr.1 rename to usr.bin/bmake/tests/basic/t3/expected.stderr.1 diff --git a/usr.bin/make/tests/basic/t3/expected.stdout.1 b/usr.bin/bmake/tests/basic/t3/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/basic/t3/expected.stdout.1 rename to usr.bin/bmake/tests/basic/t3/expected.stdout.1 diff --git a/usr.bin/make/tests/basic/t3/legacy_test.sh b/usr.bin/bmake/tests/basic/t3/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/basic/t3/legacy_test.sh rename to usr.bin/bmake/tests/basic/t3/legacy_test.sh diff --git a/usr.bin/make/tests/common.sh b/usr.bin/bmake/tests/common.sh similarity index 100% rename from usr.bin/make/tests/common.sh rename to usr.bin/bmake/tests/common.sh diff --git a/usr.bin/make/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile similarity index 62% rename from usr.bin/make/tests/execution/Makefile rename to usr.bin/bmake/tests/execution/Makefile index 52ba9b77b..2c91bbba2 100644 --- a/usr.bin/make/tests/execution/Makefile +++ b/usr.bin/bmake/tests/execution/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/execution +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution TESTS_SUBDIRS= ellipsis empty joberr plus diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile similarity index 77% rename from usr.bin/make/tests/execution/ellipsis/Makefile rename to usr.bin/bmake/tests/execution/ellipsis/Makefile index 7f3dc3ecf..5629b4bb0 100644 --- a/usr.bin/make/tests/execution/ellipsis/Makefile +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/execution/ellipsis +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test similarity index 100% rename from usr.bin/make/tests/execution/ellipsis/Makefile.test rename to usr.bin/bmake/tests/execution/ellipsis/Makefile.test diff --git a/usr.bin/make/tests/execution/ellipsis/expected.status.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1 similarity index 100% rename from usr.bin/make/tests/execution/ellipsis/expected.status.1 rename to usr.bin/bmake/tests/execution/ellipsis/expected.status.1 diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stderr.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/execution/ellipsis/expected.stderr.1 rename to usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1 diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stdout.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/execution/ellipsis/expected.stdout.1 rename to usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1 diff --git a/usr.bin/make/tests/execution/ellipsis/legacy_test.sh b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/execution/ellipsis/legacy_test.sh rename to usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh diff --git a/usr.bin/make/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile similarity index 78% rename from usr.bin/make/tests/execution/joberr/Makefile rename to usr.bin/bmake/tests/execution/empty/Makefile index eb7795753..6421b9620 100644 --- a/usr.bin/make/tests/execution/joberr/Makefile +++ b/usr.bin/bmake/tests/execution/empty/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/execution/joberr +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test similarity index 100% rename from usr.bin/make/tests/execution/empty/Makefile.test rename to usr.bin/bmake/tests/execution/empty/Makefile.test diff --git a/usr.bin/make/tests/execution/empty/expected.status.1 b/usr.bin/bmake/tests/execution/empty/expected.status.1 similarity index 100% rename from usr.bin/make/tests/execution/empty/expected.status.1 rename to usr.bin/bmake/tests/execution/empty/expected.status.1 diff --git a/usr.bin/make/tests/execution/empty/expected.stderr.1 b/usr.bin/bmake/tests/execution/empty/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/execution/empty/expected.stderr.1 rename to usr.bin/bmake/tests/execution/empty/expected.stderr.1 diff --git a/usr.bin/make/tests/execution/empty/expected.stdout.1 b/usr.bin/bmake/tests/execution/empty/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/execution/empty/expected.stdout.1 rename to usr.bin/bmake/tests/execution/empty/expected.stdout.1 diff --git a/usr.bin/make/tests/execution/empty/legacy_test.sh b/usr.bin/bmake/tests/execution/empty/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/execution/empty/legacy_test.sh rename to usr.bin/bmake/tests/execution/empty/legacy_test.sh diff --git a/usr.bin/make/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile similarity index 77% rename from usr.bin/make/tests/execution/empty/Makefile rename to usr.bin/bmake/tests/execution/joberr/Makefile index 31c27149b..d183eb134 100644 --- a/usr.bin/make/tests/execution/empty/Makefile +++ b/usr.bin/bmake/tests/execution/joberr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/execution/empty +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test similarity index 100% rename from usr.bin/make/tests/execution/joberr/Makefile.test rename to usr.bin/bmake/tests/execution/joberr/Makefile.test diff --git a/usr.bin/make/tests/execution/joberr/expected.status.1 b/usr.bin/bmake/tests/execution/joberr/expected.status.1 similarity index 100% rename from usr.bin/make/tests/execution/joberr/expected.status.1 rename to usr.bin/bmake/tests/execution/joberr/expected.status.1 diff --git a/usr.bin/make/tests/execution/joberr/expected.stderr.1 b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/execution/joberr/expected.stderr.1 rename to usr.bin/bmake/tests/execution/joberr/expected.stderr.1 diff --git a/usr.bin/make/tests/execution/joberr/expected.stdout.1 b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/execution/joberr/expected.stdout.1 rename to usr.bin/bmake/tests/execution/joberr/expected.stdout.1 diff --git a/usr.bin/make/tests/execution/joberr/legacy_test.sh b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/execution/joberr/legacy_test.sh rename to usr.bin/bmake/tests/execution/joberr/legacy_test.sh diff --git a/usr.bin/make/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile similarity index 78% rename from usr.bin/make/tests/execution/plus/Makefile rename to usr.bin/bmake/tests/execution/plus/Makefile index 2dea97944..8b489d56c 100644 --- a/usr.bin/make/tests/execution/plus/Makefile +++ b/usr.bin/bmake/tests/execution/plus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/execution/plus +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test similarity index 100% rename from usr.bin/make/tests/execution/plus/Makefile.test rename to usr.bin/bmake/tests/execution/plus/Makefile.test diff --git a/usr.bin/make/tests/execution/plus/expected.status.1 b/usr.bin/bmake/tests/execution/plus/expected.status.1 similarity index 100% rename from usr.bin/make/tests/execution/plus/expected.status.1 rename to usr.bin/bmake/tests/execution/plus/expected.status.1 diff --git a/usr.bin/make/tests/execution/plus/expected.stderr.1 b/usr.bin/bmake/tests/execution/plus/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/execution/plus/expected.stderr.1 rename to usr.bin/bmake/tests/execution/plus/expected.stderr.1 diff --git a/usr.bin/make/tests/execution/plus/expected.stdout.1 b/usr.bin/bmake/tests/execution/plus/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/execution/plus/expected.stdout.1 rename to usr.bin/bmake/tests/execution/plus/expected.stdout.1 diff --git a/usr.bin/make/tests/execution/plus/legacy_test.sh b/usr.bin/bmake/tests/execution/plus/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/execution/plus/legacy_test.sh rename to usr.bin/bmake/tests/execution/plus/legacy_test.sh diff --git a/usr.bin/make/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile similarity index 69% rename from usr.bin/make/tests/shell/Makefile rename to usr.bin/bmake/tests/shell/Makefile index cde833597..13b570ea6 100644 --- a/usr.bin/make/tests/shell/Makefile +++ b/usr.bin/bmake/tests/shell/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell TESTS_SUBDIRS= builtin meta path path_select replace select diff --git a/usr.bin/make/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile similarity index 84% rename from usr.bin/make/tests/shell/builtin/Makefile rename to usr.bin/bmake/tests/shell/builtin/Makefile index 3a73215e8..cd458a973 100644 --- a/usr.bin/make/tests/shell/builtin/Makefile +++ b/usr.bin/bmake/tests/shell/builtin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/builtin +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/builtin TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/builtin/Makefile.test b/usr.bin/bmake/tests/shell/builtin/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/builtin/Makefile.test rename to usr.bin/bmake/tests/shell/builtin/Makefile.test diff --git a/usr.bin/make/tests/shell/builtin/expected.status.1 b/usr.bin/bmake/tests/shell/builtin/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.status.1 rename to usr.bin/bmake/tests/shell/builtin/expected.status.1 diff --git a/usr.bin/make/tests/shell/builtin/expected.status.2 b/usr.bin/bmake/tests/shell/builtin/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.status.2 rename to usr.bin/bmake/tests/shell/builtin/expected.status.2 diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.1 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.stderr.1 rename to usr.bin/bmake/tests/shell/builtin/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.2 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.stderr.2 rename to usr.bin/bmake/tests/shell/builtin/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.1 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.stdout.1 rename to usr.bin/bmake/tests/shell/builtin/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.2 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/builtin/expected.stdout.2 rename to usr.bin/bmake/tests/shell/builtin/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/builtin/legacy_test.sh b/usr.bin/bmake/tests/shell/builtin/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/builtin/legacy_test.sh rename to usr.bin/bmake/tests/shell/builtin/legacy_test.sh diff --git a/usr.bin/make/tests/shell/builtin/sh b/usr.bin/bmake/tests/shell/builtin/sh similarity index 100% rename from usr.bin/make/tests/shell/builtin/sh rename to usr.bin/bmake/tests/shell/builtin/sh diff --git a/usr.bin/make/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile similarity index 85% rename from usr.bin/make/tests/shell/meta/Makefile rename to usr.bin/bmake/tests/shell/meta/Makefile index ebd2177cc..b342e79e3 100644 --- a/usr.bin/make/tests/shell/meta/Makefile +++ b/usr.bin/bmake/tests/shell/meta/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/meta +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/meta TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/meta/Makefile.test b/usr.bin/bmake/tests/shell/meta/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/meta/Makefile.test rename to usr.bin/bmake/tests/shell/meta/Makefile.test diff --git a/usr.bin/make/tests/shell/meta/expected.status.1 b/usr.bin/bmake/tests/shell/meta/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.status.1 rename to usr.bin/bmake/tests/shell/meta/expected.status.1 diff --git a/usr.bin/make/tests/shell/meta/expected.status.2 b/usr.bin/bmake/tests/shell/meta/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.status.2 rename to usr.bin/bmake/tests/shell/meta/expected.status.2 diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.1 b/usr.bin/bmake/tests/shell/meta/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.stderr.1 rename to usr.bin/bmake/tests/shell/meta/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.2 b/usr.bin/bmake/tests/shell/meta/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.stderr.2 rename to usr.bin/bmake/tests/shell/meta/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.1 b/usr.bin/bmake/tests/shell/meta/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.stdout.1 rename to usr.bin/bmake/tests/shell/meta/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.2 b/usr.bin/bmake/tests/shell/meta/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/meta/expected.stdout.2 rename to usr.bin/bmake/tests/shell/meta/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/meta/legacy_test.sh b/usr.bin/bmake/tests/shell/meta/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/meta/legacy_test.sh rename to usr.bin/bmake/tests/shell/meta/legacy_test.sh diff --git a/usr.bin/make/tests/shell/meta/sh b/usr.bin/bmake/tests/shell/meta/sh similarity index 100% rename from usr.bin/make/tests/shell/meta/sh rename to usr.bin/bmake/tests/shell/meta/sh diff --git a/usr.bin/make/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile similarity index 85% rename from usr.bin/make/tests/shell/path/Makefile rename to usr.bin/bmake/tests/shell/path/Makefile index d1eb37af2..5a83a1ff6 100644 --- a/usr.bin/make/tests/shell/path/Makefile +++ b/usr.bin/bmake/tests/shell/path/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/path +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/path/Makefile.test b/usr.bin/bmake/tests/shell/path/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/path/Makefile.test rename to usr.bin/bmake/tests/shell/path/Makefile.test diff --git a/usr.bin/make/tests/shell/path/expected.status.1 b/usr.bin/bmake/tests/shell/path/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.status.1 rename to usr.bin/bmake/tests/shell/path/expected.status.1 diff --git a/usr.bin/make/tests/shell/path/expected.status.2 b/usr.bin/bmake/tests/shell/path/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.status.2 rename to usr.bin/bmake/tests/shell/path/expected.status.2 diff --git a/usr.bin/make/tests/shell/path/expected.stderr.1 b/usr.bin/bmake/tests/shell/path/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.stderr.1 rename to usr.bin/bmake/tests/shell/path/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/path/expected.stderr.2 b/usr.bin/bmake/tests/shell/path/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.stderr.2 rename to usr.bin/bmake/tests/shell/path/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/path/expected.stdout.1 b/usr.bin/bmake/tests/shell/path/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.stdout.1 rename to usr.bin/bmake/tests/shell/path/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/path/expected.stdout.2 b/usr.bin/bmake/tests/shell/path/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/path/expected.stdout.2 rename to usr.bin/bmake/tests/shell/path/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/path/legacy_test.sh b/usr.bin/bmake/tests/shell/path/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/path/legacy_test.sh rename to usr.bin/bmake/tests/shell/path/legacy_test.sh diff --git a/usr.bin/make/tests/shell/path/sh b/usr.bin/bmake/tests/shell/path/sh similarity index 100% rename from usr.bin/make/tests/shell/path/sh rename to usr.bin/bmake/tests/shell/path/sh diff --git a/usr.bin/make/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile similarity index 83% rename from usr.bin/make/tests/shell/path_select/Makefile rename to usr.bin/bmake/tests/shell/path_select/Makefile index d9341b4f1..1819f910a 100644 --- a/usr.bin/make/tests/shell/path_select/Makefile +++ b/usr.bin/bmake/tests/shell/path_select/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/path_select +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path_select TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/path_select/Makefile.test b/usr.bin/bmake/tests/shell/path_select/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/path_select/Makefile.test rename to usr.bin/bmake/tests/shell/path_select/Makefile.test diff --git a/usr.bin/make/tests/shell/path_select/expected.status.1 b/usr.bin/bmake/tests/shell/path_select/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.status.1 rename to usr.bin/bmake/tests/shell/path_select/expected.status.1 diff --git a/usr.bin/make/tests/shell/path_select/expected.status.2 b/usr.bin/bmake/tests/shell/path_select/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.status.2 rename to usr.bin/bmake/tests/shell/path_select/expected.status.2 diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.1 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.stderr.1 rename to usr.bin/bmake/tests/shell/path_select/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.2 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.stderr.2 rename to usr.bin/bmake/tests/shell/path_select/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.1 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.stdout.1 rename to usr.bin/bmake/tests/shell/path_select/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.2 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/path_select/expected.stdout.2 rename to usr.bin/bmake/tests/shell/path_select/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/path_select/legacy_test.sh b/usr.bin/bmake/tests/shell/path_select/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/path_select/legacy_test.sh rename to usr.bin/bmake/tests/shell/path_select/legacy_test.sh diff --git a/usr.bin/make/tests/shell/path_select/shell b/usr.bin/bmake/tests/shell/path_select/shell similarity index 100% rename from usr.bin/make/tests/shell/path_select/shell rename to usr.bin/bmake/tests/shell/path_select/shell diff --git a/usr.bin/make/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile similarity index 84% rename from usr.bin/make/tests/shell/replace/Makefile rename to usr.bin/bmake/tests/shell/replace/Makefile index 7c64d7213..0dae9154b 100644 --- a/usr.bin/make/tests/shell/replace/Makefile +++ b/usr.bin/bmake/tests/shell/replace/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/replace +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/replace TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/replace/Makefile.test b/usr.bin/bmake/tests/shell/replace/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/replace/Makefile.test rename to usr.bin/bmake/tests/shell/replace/Makefile.test diff --git a/usr.bin/make/tests/shell/replace/expected.status.1 b/usr.bin/bmake/tests/shell/replace/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.status.1 rename to usr.bin/bmake/tests/shell/replace/expected.status.1 diff --git a/usr.bin/make/tests/shell/replace/expected.status.2 b/usr.bin/bmake/tests/shell/replace/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.status.2 rename to usr.bin/bmake/tests/shell/replace/expected.status.2 diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.1 b/usr.bin/bmake/tests/shell/replace/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.stderr.1 rename to usr.bin/bmake/tests/shell/replace/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.2 b/usr.bin/bmake/tests/shell/replace/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.stderr.2 rename to usr.bin/bmake/tests/shell/replace/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.1 b/usr.bin/bmake/tests/shell/replace/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.stdout.1 rename to usr.bin/bmake/tests/shell/replace/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.2 b/usr.bin/bmake/tests/shell/replace/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/replace/expected.stdout.2 rename to usr.bin/bmake/tests/shell/replace/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/replace/legacy_test.sh b/usr.bin/bmake/tests/shell/replace/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/replace/legacy_test.sh rename to usr.bin/bmake/tests/shell/replace/legacy_test.sh diff --git a/usr.bin/make/tests/shell/replace/shell b/usr.bin/bmake/tests/shell/replace/shell similarity index 100% rename from usr.bin/make/tests/shell/replace/shell rename to usr.bin/bmake/tests/shell/replace/shell diff --git a/usr.bin/make/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile similarity index 84% rename from usr.bin/make/tests/shell/select/Makefile rename to usr.bin/bmake/tests/shell/select/Makefile index 85486c678..45e6d72b6 100644 --- a/usr.bin/make/tests/shell/select/Makefile +++ b/usr.bin/bmake/tests/shell/select/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/shell/select +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/select TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/shell/select/Makefile.test b/usr.bin/bmake/tests/shell/select/Makefile.test similarity index 100% rename from usr.bin/make/tests/shell/select/Makefile.test rename to usr.bin/bmake/tests/shell/select/Makefile.test diff --git a/usr.bin/make/tests/shell/select/expected.status.1 b/usr.bin/bmake/tests/shell/select/expected.status.1 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.status.1 rename to usr.bin/bmake/tests/shell/select/expected.status.1 diff --git a/usr.bin/make/tests/shell/select/expected.status.2 b/usr.bin/bmake/tests/shell/select/expected.status.2 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.status.2 rename to usr.bin/bmake/tests/shell/select/expected.status.2 diff --git a/usr.bin/make/tests/shell/select/expected.stderr.1 b/usr.bin/bmake/tests/shell/select/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.stderr.1 rename to usr.bin/bmake/tests/shell/select/expected.stderr.1 diff --git a/usr.bin/make/tests/shell/select/expected.stderr.2 b/usr.bin/bmake/tests/shell/select/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.stderr.2 rename to usr.bin/bmake/tests/shell/select/expected.stderr.2 diff --git a/usr.bin/make/tests/shell/select/expected.stdout.1 b/usr.bin/bmake/tests/shell/select/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.stdout.1 rename to usr.bin/bmake/tests/shell/select/expected.stdout.1 diff --git a/usr.bin/make/tests/shell/select/expected.stdout.2 b/usr.bin/bmake/tests/shell/select/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/shell/select/expected.stdout.2 rename to usr.bin/bmake/tests/shell/select/expected.stdout.2 diff --git a/usr.bin/make/tests/shell/select/legacy_test.sh b/usr.bin/bmake/tests/shell/select/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/shell/select/legacy_test.sh rename to usr.bin/bmake/tests/shell/select/legacy_test.sh diff --git a/usr.bin/make/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile similarity index 63% rename from usr.bin/make/tests/suffixes/Makefile rename to usr.bin/bmake/tests/suffixes/Makefile index f15620d32..60ec86e7e 100644 --- a/usr.bin/make/tests/suffixes/Makefile +++ b/usr.bin/bmake/tests/suffixes/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/suffixes +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes TESTS_SUBDIRS= basic src_wild1 src_wild2 diff --git a/usr.bin/make/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile similarity index 79% rename from usr.bin/make/tests/suffixes/basic/Makefile rename to usr.bin/bmake/tests/suffixes/basic/Makefile index 2bd3a788e..9ae720ee8 100644 --- a/usr.bin/make/tests/suffixes/basic/Makefile +++ b/usr.bin/bmake/tests/suffixes/basic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/suffixes/basic +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/basic TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/suffixes/basic/Makefile.test b/usr.bin/bmake/tests/suffixes/basic/Makefile.test similarity index 100% rename from usr.bin/make/tests/suffixes/basic/Makefile.test rename to usr.bin/bmake/tests/suffixes/basic/Makefile.test diff --git a/usr.bin/make/tests/suffixes/basic/TEST1.a b/usr.bin/bmake/tests/suffixes/basic/TEST1.a similarity index 100% rename from usr.bin/make/tests/suffixes/basic/TEST1.a rename to usr.bin/bmake/tests/suffixes/basic/TEST1.a diff --git a/usr.bin/make/tests/suffixes/basic/expected.status.1 b/usr.bin/bmake/tests/suffixes/basic/expected.status.1 similarity index 100% rename from usr.bin/make/tests/suffixes/basic/expected.status.1 rename to usr.bin/bmake/tests/suffixes/basic/expected.status.1 diff --git a/usr.bin/make/tests/suffixes/basic/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/suffixes/basic/expected.stderr.1 rename to usr.bin/bmake/tests/suffixes/basic/expected.stderr.1 diff --git a/usr.bin/make/tests/suffixes/basic/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/suffixes/basic/expected.stdout.1 rename to usr.bin/bmake/tests/suffixes/basic/expected.stdout.1 diff --git a/usr.bin/make/tests/suffixes/basic/legacy_test.sh b/usr.bin/bmake/tests/suffixes/basic/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/suffixes/basic/legacy_test.sh rename to usr.bin/bmake/tests/suffixes/basic/legacy_test.sh diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile similarity index 80% rename from usr.bin/make/tests/suffixes/src_wild1/Makefile rename to usr.bin/bmake/tests/suffixes/src_wild1/Makefile index e10e8e893..00be93004 100644 --- a/usr.bin/make/tests/suffixes/src_wild1/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/suffixes/src_wild1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/Makefile.test rename to usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/TEST1.a rename to usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/TEST2.a rename to usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/expected.status.1 rename to usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1 diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 rename to usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1 diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 rename to usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1 diff --git a/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh rename to usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile similarity index 80% rename from usr.bin/make/tests/suffixes/src_wild2/Makefile rename to usr.bin/bmake/tests/suffixes/src_wild2/Makefile index a474baeaa..34aad07fc 100644 --- a/usr.bin/make/tests/suffixes/src_wild2/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/suffixes/src_wild2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/Makefile.test rename to usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/TEST1.a rename to usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/TEST2.a rename to usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/expected.status.1 rename to usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1 diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 rename to usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1 diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 rename to usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1 diff --git a/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh rename to usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh diff --git a/usr.bin/make/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile similarity index 66% rename from usr.bin/make/tests/syntax/Makefile rename to usr.bin/bmake/tests/syntax/Makefile index 80f18465c..3cd89f844 100644 --- a/usr.bin/make/tests/syntax/Makefile +++ b/usr.bin/bmake/tests/syntax/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/syntax +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax TESTS_SUBDIRS= directive-t0 enl funny-targets semi diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile new file mode 100644 index 000000000..66e1f3253 --- /dev/null +++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/directive-t0 + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile.test b/usr.bin/bmake/tests/syntax/directive-t0/Makefile.test similarity index 100% rename from usr.bin/make/tests/syntax/directive-t0/Makefile.test rename to usr.bin/bmake/tests/syntax/directive-t0/Makefile.test diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.status.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.status.1 similarity index 100% rename from usr.bin/make/tests/syntax/directive-t0/expected.status.1 rename to usr.bin/bmake/tests/syntax/directive-t0/expected.status.1 diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 rename to usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1 diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 rename to usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1 diff --git a/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh b/usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/syntax/directive-t0/legacy_test.sh rename to usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh diff --git a/usr.bin/make/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile similarity index 91% rename from usr.bin/make/tests/syntax/enl/Makefile rename to usr.bin/bmake/tests/syntax/enl/Makefile index 362962c44..743e88fb4 100644 --- a/usr.bin/make/tests/syntax/enl/Makefile +++ b/usr.bin/bmake/tests/syntax/enl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/syntax/enl +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/enl TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/syntax/enl/Makefile.test b/usr.bin/bmake/tests/syntax/enl/Makefile.test similarity index 100% rename from usr.bin/make/tests/syntax/enl/Makefile.test rename to usr.bin/bmake/tests/syntax/enl/Makefile.test diff --git a/usr.bin/make/tests/syntax/enl/expected.status.1 b/usr.bin/bmake/tests/syntax/enl/expected.status.1 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.status.1 rename to usr.bin/bmake/tests/syntax/enl/expected.status.1 diff --git a/usr.bin/make/tests/syntax/enl/expected.status.2 b/usr.bin/bmake/tests/syntax/enl/expected.status.2 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.status.2 rename to usr.bin/bmake/tests/syntax/enl/expected.status.2 diff --git a/usr.bin/make/tests/syntax/enl/expected.status.3 b/usr.bin/bmake/tests/syntax/enl/expected.status.3 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.status.3 rename to usr.bin/bmake/tests/syntax/enl/expected.status.3 diff --git a/usr.bin/make/tests/syntax/enl/expected.status.4 b/usr.bin/bmake/tests/syntax/enl/expected.status.4 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.status.4 rename to usr.bin/bmake/tests/syntax/enl/expected.status.4 diff --git a/usr.bin/make/tests/syntax/enl/expected.status.5 b/usr.bin/bmake/tests/syntax/enl/expected.status.5 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.status.5 rename to usr.bin/bmake/tests/syntax/enl/expected.status.5 diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.1 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stderr.1 rename to usr.bin/bmake/tests/syntax/enl/expected.stderr.1 diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.2 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stderr.2 rename to usr.bin/bmake/tests/syntax/enl/expected.stderr.2 diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.3 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.3 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stderr.3 rename to usr.bin/bmake/tests/syntax/enl/expected.stderr.3 diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.4 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.4 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stderr.4 rename to usr.bin/bmake/tests/syntax/enl/expected.stderr.4 diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.5 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.5 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stderr.5 rename to usr.bin/bmake/tests/syntax/enl/expected.stderr.5 diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.1 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stdout.1 rename to usr.bin/bmake/tests/syntax/enl/expected.stdout.1 diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.2 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stdout.2 rename to usr.bin/bmake/tests/syntax/enl/expected.stdout.2 diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.3 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.3 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stdout.3 rename to usr.bin/bmake/tests/syntax/enl/expected.stdout.3 diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.4 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.4 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stdout.4 rename to usr.bin/bmake/tests/syntax/enl/expected.stdout.4 diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.5 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.5 similarity index 100% rename from usr.bin/make/tests/syntax/enl/expected.stdout.5 rename to usr.bin/bmake/tests/syntax/enl/expected.stdout.5 diff --git a/usr.bin/make/tests/syntax/enl/legacy_test.sh b/usr.bin/bmake/tests/syntax/enl/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/syntax/enl/legacy_test.sh rename to usr.bin/bmake/tests/syntax/enl/legacy_test.sh diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile similarity index 82% rename from usr.bin/make/tests/syntax/funny-targets/Makefile rename to usr.bin/bmake/tests/syntax/funny-targets/Makefile index 07b1f7544..53a3e4d76 100644 --- a/usr.bin/make/tests/syntax/funny-targets/Makefile +++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/syntax/funny-targets +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/funny-targets TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile.test b/usr.bin/bmake/tests/syntax/funny-targets/Makefile.test similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/Makefile.test rename to usr.bin/bmake/tests/syntax/funny-targets/Makefile.test diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.1 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.status.1 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.status.1 diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.2 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.status.2 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.status.2 diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1 diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2 diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1 diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 rename to usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2 diff --git a/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh b/usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/syntax/funny-targets/legacy_test.sh rename to usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh diff --git a/usr.bin/make/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile similarity index 84% rename from usr.bin/make/tests/syntax/semi/Makefile rename to usr.bin/bmake/tests/syntax/semi/Makefile index 703683d1c..00a7f1e94 100644 --- a/usr.bin/make/tests/syntax/semi/Makefile +++ b/usr.bin/bmake/tests/syntax/semi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/syntax/semi +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/semi TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/syntax/semi/Makefile.test b/usr.bin/bmake/tests/syntax/semi/Makefile.test similarity index 100% rename from usr.bin/make/tests/syntax/semi/Makefile.test rename to usr.bin/bmake/tests/syntax/semi/Makefile.test diff --git a/usr.bin/make/tests/syntax/semi/expected.status.1 b/usr.bin/bmake/tests/syntax/semi/expected.status.1 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.status.1 rename to usr.bin/bmake/tests/syntax/semi/expected.status.1 diff --git a/usr.bin/make/tests/syntax/semi/expected.status.2 b/usr.bin/bmake/tests/syntax/semi/expected.status.2 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.status.2 rename to usr.bin/bmake/tests/syntax/semi/expected.status.2 diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.1 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.stderr.1 rename to usr.bin/bmake/tests/syntax/semi/expected.stderr.1 diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.2 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.stderr.2 rename to usr.bin/bmake/tests/syntax/semi/expected.stderr.2 diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.1 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.stdout.1 rename to usr.bin/bmake/tests/syntax/semi/expected.stdout.1 diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.2 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/syntax/semi/expected.stdout.2 rename to usr.bin/bmake/tests/syntax/semi/expected.stdout.2 diff --git a/usr.bin/make/tests/syntax/semi/legacy_test.sh b/usr.bin/bmake/tests/syntax/semi/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/syntax/semi/legacy_test.sh rename to usr.bin/bmake/tests/syntax/semi/legacy_test.sh diff --git a/usr.bin/make/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile similarity index 59% rename from usr.bin/make/tests/sysmk/Makefile rename to usr.bin/bmake/tests/sysmk/Makefile index 7b7b9819b..90d90f1dd 100644 --- a/usr.bin/make/tests/sysmk/Makefile +++ b/usr.bin/bmake/tests/sysmk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk TESTS_SUBDIRS= t0 t1 t2 diff --git a/usr.bin/make/tests/variables/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile similarity index 79% rename from usr.bin/make/tests/variables/t0/Makefile rename to usr.bin/bmake/tests/sysmk/t0/2/1/Makefile index 06e117972..5578a9b90 100644 --- a/usr.bin/make/tests/variables/t0/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/variables/t0 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test similarity index 100% rename from usr.bin/make/tests/sysmk/t0/2/1/Makefile.test rename to usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 rename to usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1 diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 rename to usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1 diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 rename to usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1 diff --git a/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh rename to usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh diff --git a/usr.bin/make/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile similarity index 53% rename from usr.bin/make/tests/sysmk/t2/2/Makefile rename to usr.bin/bmake/tests/sysmk/t0/2/Makefile index 3dd84f0d0..220480788 100644 --- a/usr.bin/make/tests/sysmk/t2/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t2/2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/make/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile similarity index 59% rename from usr.bin/make/tests/sysmk/t1/Makefile rename to usr.bin/bmake/tests/sysmk/t0/Makefile index d8a2c06bc..f38383c4e 100644 --- a/usr.bin/make/tests/sysmk/t1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0 TESTS_SUBDIRS= 2 SUBDIR= mk diff --git a/usr.bin/make/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile similarity index 69% rename from usr.bin/make/tests/sysmk/t0/mk/Makefile rename to usr.bin/bmake/tests/sysmk/t0/mk/Makefile index 047b9de35..be1bd5a2f 100644 --- a/usr.bin/make/tests/sysmk/t0/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t0/mk +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk FILESDIR= ${TESTSDIR} FILES= sys.mk.test diff --git a/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test similarity index 100% rename from usr.bin/make/tests/sysmk/t0/mk/sys.mk.test rename to usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test diff --git a/usr.bin/make/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile similarity index 78% rename from usr.bin/make/tests/sysmk/t1/2/1/Makefile rename to usr.bin/bmake/tests/sysmk/t1/2/1/Makefile index aa937668c..c5e2889fa 100644 --- a/usr.bin/make/tests/sysmk/t1/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t1/2/1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/sysmk/t1/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup similarity index 100% rename from usr.bin/make/tests/sysmk/t1/2/1/cleanup rename to usr.bin/bmake/tests/sysmk/t1/2/1/cleanup diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 rename to usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1 diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 rename to usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1 diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 rename to usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1 diff --git a/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh rename to usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh diff --git a/usr.bin/make/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile similarity index 53% rename from usr.bin/make/tests/sysmk/t0/2/Makefile rename to usr.bin/bmake/tests/sysmk/t1/2/Makefile index ecd79b369..7c2e61927 100644 --- a/usr.bin/make/tests/sysmk/t0/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t0/2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/make/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile similarity index 59% rename from usr.bin/make/tests/sysmk/t2/Makefile rename to usr.bin/bmake/tests/sysmk/t1/Makefile index 3f95a852d..4d3282345 100644 --- a/usr.bin/make/tests/sysmk/t2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1 TESTS_SUBDIRS= 2 SUBDIR= mk diff --git a/usr.bin/make/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile similarity index 69% rename from usr.bin/make/tests/sysmk/t1/mk/Makefile rename to usr.bin/bmake/tests/sysmk/t1/mk/Makefile index da052af94..ccfd1b6b6 100644 --- a/usr.bin/make/tests/sysmk/t1/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t1/mk +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk FILESDIR= ${TESTSDIR} FILES= sys.mk.test diff --git a/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test similarity index 100% rename from usr.bin/make/tests/sysmk/t1/mk/sys.mk.test rename to usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test diff --git a/usr.bin/make/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile similarity index 78% rename from usr.bin/make/tests/sysmk/t2/2/1/Makefile rename to usr.bin/bmake/tests/sysmk/t2/2/1/Makefile index 52fdd8d7e..e06539a87 100644 --- a/usr.bin/make/tests/sysmk/t2/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t2/2/1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/sysmk/t2/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup similarity index 100% rename from usr.bin/make/tests/sysmk/t2/2/1/cleanup rename to usr.bin/bmake/tests/sysmk/t2/2/1/cleanup diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 rename to usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1 diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 rename to usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1 diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 rename to usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1 diff --git a/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh rename to usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh diff --git a/usr.bin/make/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile similarity index 53% rename from usr.bin/make/tests/sysmk/t1/2/Makefile rename to usr.bin/bmake/tests/sysmk/t2/2/Makefile index 3e5d82cbf..7d1c68e63 100644 --- a/usr.bin/make/tests/sysmk/t1/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t1/2 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/make/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile similarity index 59% rename from usr.bin/make/tests/sysmk/t0/Makefile rename to usr.bin/bmake/tests/sysmk/t2/Makefile index 277792575..734c7d880 100644 --- a/usr.bin/make/tests/sysmk/t0/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t0 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2 TESTS_SUBDIRS= 2 SUBDIR= mk diff --git a/usr.bin/make/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile similarity index 69% rename from usr.bin/make/tests/sysmk/t2/mk/Makefile rename to usr.bin/bmake/tests/sysmk/t2/mk/Makefile index 5fdb1ac83..29460dc18 100644 --- a/usr.bin/make/tests/sysmk/t2/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t2/mk +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk FILESDIR= ${TESTSDIR} FILES= sys.mk.test diff --git a/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test similarity index 100% rename from usr.bin/make/tests/sysmk/t2/mk/sys.mk.test rename to usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test diff --git a/usr.bin/make/tests/test-new.mk b/usr.bin/bmake/tests/test-new.mk similarity index 100% rename from usr.bin/make/tests/test-new.mk rename to usr.bin/bmake/tests/test-new.mk diff --git a/usr.bin/make/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile similarity index 64% rename from usr.bin/make/tests/variables/Makefile rename to usr.bin/bmake/tests/variables/Makefile index 9f328a837..e010718e6 100644 --- a/usr.bin/make/tests/variables/Makefile +++ b/usr.bin/bmake/tests/variables/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/variables +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables TESTS_SUBDIRS= modifier_M modifier_t opt_V t0 diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile new file mode 100644 index 000000000..2490382f8 --- /dev/null +++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile.test b/usr.bin/bmake/tests/variables/modifier_M/Makefile.test similarity index 100% rename from usr.bin/make/tests/variables/modifier_M/Makefile.test rename to usr.bin/bmake/tests/variables/modifier_M/Makefile.test diff --git a/usr.bin/make/tests/variables/modifier_M/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.status.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_M/expected.status.1 rename to usr.bin/bmake/tests/variables/modifier_M/expected.status.1 diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_M/expected.stderr.1 rename to usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1 diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_M/expected.stdout.1 rename to usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1 diff --git a/usr.bin/make/tests/variables/modifier_M/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/variables/modifier_M/legacy_test.sh rename to usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile similarity index 85% rename from usr.bin/make/tests/variables/modifier_t/Makefile rename to usr.bin/bmake/tests/variables/modifier_t/Makefile index 4b5bfee0d..d108da43e 100644 --- a/usr.bin/make/tests/variables/modifier_t/Makefile +++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/variables/modifier_t +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile.test b/usr.bin/bmake/tests/variables/modifier_t/Makefile.test similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/Makefile.test rename to usr.bin/bmake/tests/variables/modifier_t/Makefile.test diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.status.1 rename to usr.bin/bmake/tests/variables/modifier_t/expected.status.1 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.2 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.status.2 rename to usr.bin/bmake/tests/variables/modifier_t/expected.status.2 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.3 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.status.3 rename to usr.bin/bmake/tests/variables/modifier_t/expected.status.3 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stderr.1 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stderr.2 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stderr.3 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stdout.1 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stdout.2 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2 diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3 similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/expected.stdout.3 rename to usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3 diff --git a/usr.bin/make/tests/variables/modifier_t/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/variables/modifier_t/legacy_test.sh rename to usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh diff --git a/usr.bin/make/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile similarity index 83% rename from usr.bin/make/tests/variables/opt_V/Makefile rename to usr.bin/bmake/tests/variables/opt_V/Makefile index 0c3bf1779..94a6affd5 100644 --- a/usr.bin/make/tests/variables/opt_V/Makefile +++ b/usr.bin/bmake/tests/variables/opt_V/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/variables/opt_V +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/variables/opt_V/Makefile.test b/usr.bin/bmake/tests/variables/opt_V/Makefile.test similarity index 100% rename from usr.bin/make/tests/variables/opt_V/Makefile.test rename to usr.bin/bmake/tests/variables/opt_V/Makefile.test diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.1 b/usr.bin/bmake/tests/variables/opt_V/expected.status.1 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.status.1 rename to usr.bin/bmake/tests/variables/opt_V/expected.status.1 diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.2 b/usr.bin/bmake/tests/variables/opt_V/expected.status.2 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.status.2 rename to usr.bin/bmake/tests/variables/opt_V/expected.status.2 diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.stderr.1 rename to usr.bin/bmake/tests/variables/opt_V/expected.stderr.1 diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.2 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.stderr.2 rename to usr.bin/bmake/tests/variables/opt_V/expected.stderr.2 diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.stdout.1 rename to usr.bin/bmake/tests/variables/opt_V/expected.stdout.1 diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.2 similarity index 100% rename from usr.bin/make/tests/variables/opt_V/expected.stdout.2 rename to usr.bin/bmake/tests/variables/opt_V/expected.stdout.2 diff --git a/usr.bin/make/tests/variables/opt_V/legacy_test.sh b/usr.bin/bmake/tests/variables/opt_V/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/variables/opt_V/legacy_test.sh rename to usr.bin/bmake/tests/variables/opt_V/legacy_test.sh diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile similarity index 79% rename from usr.bin/make/tests/sysmk/t0/2/1/Makefile rename to usr.bin/bmake/tests/variables/t0/Makefile index 2c732f5ba..c4b98e653 100644 --- a/usr.bin/make/tests/sysmk/t0/2/1/Makefile +++ b/usr.bin/bmake/tests/variables/t0/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/make/sysmk/t0/2/1 +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0 TAP_TESTS_SH= legacy_test diff --git a/usr.bin/make/tests/variables/t0/Makefile.test b/usr.bin/bmake/tests/variables/t0/Makefile.test similarity index 100% rename from usr.bin/make/tests/variables/t0/Makefile.test rename to usr.bin/bmake/tests/variables/t0/Makefile.test diff --git a/usr.bin/make/tests/variables/t0/expected.status.1 b/usr.bin/bmake/tests/variables/t0/expected.status.1 similarity index 100% rename from usr.bin/make/tests/variables/t0/expected.status.1 rename to usr.bin/bmake/tests/variables/t0/expected.status.1 diff --git a/usr.bin/make/tests/variables/t0/expected.stderr.1 b/usr.bin/bmake/tests/variables/t0/expected.stderr.1 similarity index 100% rename from usr.bin/make/tests/variables/t0/expected.stderr.1 rename to usr.bin/bmake/tests/variables/t0/expected.stderr.1 diff --git a/usr.bin/make/tests/variables/t0/expected.stdout.1 b/usr.bin/bmake/tests/variables/t0/expected.stdout.1 similarity index 100% rename from usr.bin/make/tests/variables/t0/expected.stdout.1 rename to usr.bin/bmake/tests/variables/t0/expected.stdout.1 diff --git a/usr.bin/make/tests/variables/t0/legacy_test.sh b/usr.bin/bmake/tests/variables/t0/legacy_test.sh similarity index 100% rename from usr.bin/make/tests/variables/t0/legacy_test.sh rename to usr.bin/bmake/tests/variables/t0/legacy_test.sh diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 9b8290c5b..4605bb39a 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -118,8 +118,4 @@ fmake.1: make.1 cp ${.ALLSRC} ${.TARGET} .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .include diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile deleted file mode 100644 index 6d557e2a2..000000000 --- a/usr.bin/make/tests/syntax/directive-t0/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -TESTSDIR= ${TESTSBASE}/usr.bin/make/syntax/directive-t0 - -TAP_TESTS_SH= legacy_test - -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 - -.include diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile deleted file mode 100644 index 59cb0bc1d..000000000 --- a/usr.bin/make/tests/variables/modifier_M/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -TESTSDIR= ${TESTSBASE}/usr.bin/make/variables/modifier_M - -TAP_TESTS_SH= legacy_test - -FILESDIR= ${TESTSDIR} -FILES= Makefile.test -FILES+= expected.status.1 -FILES+= expected.stderr.1 -FILES+= expected.stdout.1 - -.include -- 2.45.0