63 files changed, 110 insertions, 119 deletions

diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/tools/regression/usr.bin/make/shell/builtin/Makefile
index 6fe42abe0ef5..03764784e1a0 100644
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ b/tools/regression/usr.bin/make/shell/builtin/Makefile
@@ -7,17 +7,7 @@
 #
 # $FreeBSD$
 
-all: sh
-	@MAKEFLAGS= ${MAKE} -B no-builtin
-	@MAKEFLAGS= ${MAKE} -B builtin
-
-sh: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/sh
-	@chmod +x ${.OBJDIR}/sh
-
-.ifmake builtin || no-builtin
-
-.SHELL: path="${.OBJDIR}/sh"
+.SHELL: path="${.CURDIR}/sh"
 
 .PHONY: builtin no-builtin
 
@@ -26,5 +16,3 @@ builtin:
 
 no-builtin:
 	@ls -d .
-
-.endif
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status b/tools/regression/usr.bin/make/shell/builtin/expected.status
deleted file mode 100644
index 0cfbf08886fc..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status b/tools/regression/usr.bin/make/shell/builtin/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.status
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 b/tools/regression/usr.bin/make/shell/builtin/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr b/tools/regression/usr.bin/make/shell/builtin/expected.stderr
deleted file mode 100644
index 628ea8fef6c7..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr
+++ /dev/null
@@ -1 +0,0 @@
-make: don't know how to make sh.sh. Stop
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
new file mode 100644
index 000000000000..9c558e357c41
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
@@ -0,0 +1 @@
+.
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
new file mode 100644
index 000000000000..e350eaf8c7ea
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
@@ -0,0 +1 @@
+-ec exec ls -d .
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh.sh b/tools/regression/usr.bin/make/shell/builtin/sh
index 3a507b87f674..3a507b87f674 100644
--- a/tools/regression/usr.bin/make/shell/builtin/sh.sh
+++ b/tools/regression/usr.bin/make/shell/builtin/sh
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/tools/regression/usr.bin/make/shell/builtin/test.t
index a20fb2a761f1..1798afcc3207 100644
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ b/tools/regression/usr.bin/make/shell/builtin/test.t
@@ -5,9 +5,15 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "Check that a command line with a builtin is passed to the shell."
-}
+# Description
+DESC="Check that a command line with a builtin is passed to the shell."
 
-eval_cmd $1
+# Setup
+TEST_COPY_FILES="sh 755"
+
+# Run
+TEST_N=2
+TEST_1="-B no-builtin"
+TEST_2="-B builtin"
+
+eval_cmd $*
diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/tools/regression/usr.bin/make/shell/meta/Makefile
index 28a50d6eda16..bcf19d052bbc 100644
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ b/tools/regression/usr.bin/make/shell/meta/Makefile
@@ -7,16 +7,6 @@
 #
 # $FreeBSD$
 
-all: sh
-	@MAKEFLAGS= ${MAKE} -B no-meta
-	@MAKEFLAGS= ${MAKE} -B meta
-
-sh: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/sh
-	@chmod +x ${.OBJDIR}/sh
-
-.ifmake meta || no-meta
-
 .SHELL: path="${.OBJDIR}/sh"
 
 .PHONY: meta no-meta
@@ -26,5 +16,3 @@ meta:
 
 no-meta:
 	@ls -d .
-
-.endif
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status b/tools/regression/usr.bin/make/shell/meta/expected.status
deleted file mode 100644
index 0cfbf08886fc..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.status
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/tools/regression/usr.bin/make/shell/meta/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/meta/expected.status.1
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.2 b/tools/regression/usr.bin/make/shell/meta/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/meta/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr b/tools/regression/usr.bin/make/shell/meta/expected.stderr
deleted file mode 100644
index 628ea8fef6c7..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr
+++ /dev/null
@@ -1 +0,0 @@
-make: don't know how to make sh.sh. Stop
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout b/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout b/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
new file mode 100644
index 000000000000..9c558e357c41
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
@@ -0,0 +1 @@
+.
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
new file mode 100644
index 000000000000..6ac6f19502a5
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
@@ -0,0 +1 @@
+-ec ls *
diff --git a/tools/regression/usr.bin/make/shell/meta/sh.sh b/tools/regression/usr.bin/make/shell/meta/sh
index 3a507b87f674..3a507b87f674 100644
--- a/tools/regression/usr.bin/make/shell/meta/sh.sh
+++ b/tools/regression/usr.bin/make/shell/meta/sh
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/tools/regression/usr.bin/make/shell/meta/test.t
index f67a5c6069fb..588b73ccc9f6 100644
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ b/tools/regression/usr.bin/make/shell/meta/test.t
@@ -5,9 +5,15 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "Check that a command line with meta characters is passed to the shell."
-}
+# Description
+DESC="Check that a command line with meta characters is passed to the shell."
 
-eval_cmd $1
+# Setup
+TEST_COPY_FILES="sh 755"
+
+# Run
+TEST_N=2
+TEST_1="-B no-meta"
+TEST_2="-B meta"
+
+eval_cmd $*
diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/tools/regression/usr.bin/make/shell/path/Makefile
index 8b1ce1b0c531..fe40b645510e 100644
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ b/tools/regression/usr.bin/make/shell/path/Makefile
@@ -10,23 +10,6 @@
 # $FreeBSD$
 #
 
-all: sh csh ksh
-	@${MAKE} sh_test
-	@${MAKE} csh_test
-	@if [ -x /bin/ksh ] ; then ${MAKE} ksh_test ; fi
-
-sh: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/sh
-	@chmod +x ${.OBJDIR}/sh
-
-csh: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/csh
-	@chmod +x ${.OBJDIR}/csh
-
-ksh: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/ksh
-	@chmod +x ${.OBJDIR}/ksh
-
 .ifmake sh_test
 
 .SHELL: path=${.OBJDIR}/sh
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status b/tools/regression/usr.bin/make/shell/path/expected.status
deleted file mode 100644
index 0cfbf08886fc..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.status
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/tools/regression/usr.bin/make/shell/path/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path/expected.status.1
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.2 b/tools/regression/usr.bin/make/shell/path/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr b/tools/regression/usr.bin/make/shell/path/expected.stderr
deleted file mode 100644
index 628ea8fef6c7..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr
+++ /dev/null
@@ -1 +0,0 @@
-make: don't know how to make sh.sh. Stop
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout b/tools/regression/usr.bin/make/shell/path/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/path/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr b/tools/regression/usr.bin/make/shell/path/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr
+++ b/tools/regression/usr.bin/make/shell/path/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/tools/regression/usr.bin/make/shell/path/expected.stdout.1
new file mode 100644
index 000000000000..d881364744b2
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path/expected.stdout.1
@@ -0,0 +1 @@
+-ec : This is the shell.
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 b/tools/regression/usr.bin/make/shell/path/expected.stdout.2
new file mode 100644
index 000000000000..de3fc89cc9e2
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path/expected.stdout.2
@@ -0,0 +1 @@
+-ec : This is the C-shell.
diff --git a/tools/regression/usr.bin/make/shell/path/sh.sh b/tools/regression/usr.bin/make/shell/path/sh
index 46169eb6efc2..46169eb6efc2 100644
--- a/tools/regression/usr.bin/make/shell/path/sh.sh
+++ b/tools/regression/usr.bin/make/shell/path/sh
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/tools/regression/usr.bin/make/shell/path/test.t
index 890fb4517aa0..72ff252af70e 100644
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ b/tools/regression/usr.bin/make/shell/path/test.t
@@ -5,9 +5,18 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "New path for builtin shells."
-}
+# Description
+DESC="New path for builtin shells."
 
-eval_cmd $1
+# Setup
+TEST_COPY_FILES="sh 755"
+TEST_LINKS="sh csh	sh ksh"
+
+# Run
+TEST_N=3
+TEST_1="sh_test"
+TEST_2="csh_test"
+TEST_3="ksh_test"
+TEST_3_SKIP="no ksh on FreeBSD"
+
+eval_cmd $*
diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/tools/regression/usr.bin/make/shell/path_select/Makefile
index 6b74a410d658..05cfb27f3fd9 100644
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ b/tools/regression/usr.bin/make/shell/path_select/Makefile
@@ -10,30 +10,21 @@
 # $FreeBSD$
 #
 
-all: shell
-	@${MAKE} sh_test
-	@${MAKE} csh_test
-	@if [ -x /bin/ksh ] ; then ${MAKE} ksh_test ; fi
-
-shell: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/shell
-	@chmod +x ${.OBJDIR}/shell
-
 .ifmake sh_test
 
-.SHELL: name=sh path=${.OBJDIR}/shell
+.SHELL: name=sh path=${.CURDIR}/shell
 sh_test:
 	@: This is the shell.
 
 .elifmake csh_test
 
-.SHELL: name=csh path=${.OBJDIR}/shell
+.SHELL: name=csh path=${.CURDIR}/shell
 csh_test:
 	@: This is the C-shell.
 
 .elifmake ksh_test
 
-.SHELL: name=ksh path=${.OBJDIR}/shell
+.SHELL: name=ksh path=${.CURDIR}/shell
 ksh_test:
 	@: This is the Korn-shell.
 
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status b/tools/regression/usr.bin/make/shell/path_select/expected.status
deleted file mode 100644
index 0cfbf08886fc..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 b/tools/regression/usr.bin/make/shell/path_select/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.status.1
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 b/tools/regression/usr.bin/make/shell/path_select/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr b/tools/regression/usr.bin/make/shell/path_select/expected.stderr
deleted file mode 100644
index 628ea8fef6c7..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr
+++ /dev/null
@@ -1 +0,0 @@
-make: don't know how to make sh.sh. Stop
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1
new file mode 100644
index 000000000000..d881364744b2
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1
@@ -0,0 +1 @@
+-ec : This is the shell.
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2
new file mode 100644
index 000000000000..de3fc89cc9e2
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2
@@ -0,0 +1 @@
+-ec : This is the C-shell.
diff --git a/tools/regression/usr.bin/make/shell/path_select/sh.sh b/tools/regression/usr.bin/make/shell/path_select/shell
index 46169eb6efc2..46169eb6efc2 100644
--- a/tools/regression/usr.bin/make/shell/path_select/sh.sh
+++ b/tools/regression/usr.bin/make/shell/path_select/shell
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/tools/regression/usr.bin/make/shell/path_select/test.t
index fef0eb9cc7c6..5bac6316722e 100644
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ b/tools/regression/usr.bin/make/shell/path_select/test.t
@@ -5,9 +5,17 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "New path for builtin shells (2)."
-}
+# Description
+DESC="New path for builtin shells (2)."
 
-eval_cmd $1
+# Setup
+TEST_COPY_FILES="shell 755"
+
+# Run
+TEST_N=3
+TEST_1="sh_test"
+TEST_2="csh_test"
+TEST_3="ksh_test"
+TEST_3_SKIP="no ksh on FreeBSD"
+
+eval_cmd $*
diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/tools/regression/usr.bin/make/shell/replace/Makefile
index f903f374646c..2160dbfb5776 100644
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ b/tools/regression/usr.bin/make/shell/replace/Makefile
@@ -10,17 +10,7 @@
 #
 # $FreeBSD$
 
-all: shell
-	${MAKE} test1
-	${MAKE} -j1 test1
-
-shell: sh.sh
-	@cp ${.CURDIR}/sh.sh ${.OBJDIR}/shell
-	@chmod +x ${.OBJDIR}/shell
-
-.ifmake test1
-
-.SHELL: name="shell" path="${.OBJDIR}/shell"			\
+.SHELL: name="shell" path="${.CURDIR}/shell"			\
 	quiet="be quiet" echo="be verbose" filter="be verbose"	\
 	echoFlag="x" errFlag="y"				\
 	hasErrCtl=y check="check errors" ignore="ignore errors"
@@ -29,5 +19,3 @@ shell: sh.sh
 test1:
 	-@funny $$
 	funnier $$
-
-.endif
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status b/tools/regression/usr.bin/make/shell/replace/expected.status
deleted file mode 100644
index 0cfbf08886fc..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.status
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/tools/regression/usr.bin/make/shell/replace/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.status.1
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.2 b/tools/regression/usr.bin/make/shell/replace/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr b/tools/regression/usr.bin/make/shell/replace/expected.stderr
deleted file mode 100644
index 628ea8fef6c7..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr
+++ /dev/null
@@ -1 +0,0 @@
-make: don't know how to make sh.sh. Stop
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
new file mode 100644
index 000000000000..eff99ea17ab2
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
@@ -0,0 +1,3 @@
+-c funny $
+funnier $
+-ec funnier $
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 b/tools/regression/usr.bin/make/shell/replace/expected.stdout.2
new file mode 100644
index 000000000000..c79a09af2916
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/replace/expected.stdout.2
@@ -0,0 +1,6 @@
+-yx
+be quiet
+ignore errors
+funny $
+check errors
+funnier $
diff --git a/tools/regression/usr.bin/make/shell/replace/sh.sh b/tools/regression/usr.bin/make/shell/replace/shell
index 46169eb6efc2..46169eb6efc2 100644
--- a/tools/regression/usr.bin/make/shell/replace/sh.sh
+++ b/tools/regression/usr.bin/make/shell/replace/shell
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/tools/regression/usr.bin/make/shell/replace/test.t
index 838a60579643..5c91cf9e03e8 100644
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ b/tools/regression/usr.bin/make/shell/replace/test.t
@@ -5,9 +5,15 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "Check that the shell can be replaced."
-}
+# Description
+DESC="Check that the shell can be replaced."
 
-eval_cmd $1
+# Setup
+TEST_COPY_FILES="shell 755"
+
+# Run
+TEST_N=2
+TEST_1=
+TEST_2=-j2
+
+eval_cmd $*
diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/tools/regression/usr.bin/make/shell/select/Makefile
index 127dca285300..e1ff0231c737 100644
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ b/tools/regression/usr.bin/make/shell/select/Makefile
@@ -7,25 +7,20 @@
 # $FreeBSD$
 #
 
-all:
-	@${MAKE} sh
-	@${MAKE} csh
-	@if [ -x /bin/ksh ] ; then ${MAKE} ksh ; fi
-
-.ifmake sh
+.ifmake sh_test
 
 .SHELL: name=sh
-sh: print_path
+sh_test: print_path
 
-.elifmake csh
+.elifmake csh_test
 
 .SHELL: name=csh
-csh: print_path
+csh_test: print_path
 
-.elifmake ksh
+.elifmake ksh_test
 
 .SHELL: name=ksh
-ksh: print_path
+ksh_test: print_path
 
 .endif
 
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/tools/regression/usr.bin/make/shell/select/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/select/expected.status.1
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.2 b/tools/regression/usr.bin/make/shell/select/expected.status.2
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/select/expected.status.2
@@ -0,0 +1 @@
+0
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 b/tools/regression/usr.bin/make/shell/select/expected.stderr.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/tools/regression/usr.bin/make/shell/select/expected.stderr.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/tools/regression/usr.bin/make/shell/select/expected.stdout.1
new file mode 100644
index 000000000000..c2cdaa0f27c1
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/select/expected.stdout.1
@@ -0,0 +1 @@
+/bin/sh
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout b/tools/regression/usr.bin/make/shell/select/expected.stdout.2
index 4e4093b6b29c..5a831e82da12 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout
+++ b/tools/regression/usr.bin/make/shell/select/expected.stdout.2
@@ -1,2 +1 @@
-/bin/sh
 /bin/csh
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/tools/regression/usr.bin/make/shell/select/test.t
index 0a129c0f3f0a..7f73f9b24e25 100644
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ b/tools/regression/usr.bin/make/shell/select/test.t
@@ -5,9 +5,14 @@
 cd `dirname $0`
 . ../../common.sh
 
-desc_test()
-{
-	echo "Select the builtin sh shell."
-}
+# Description
+DESC="Select the builtin sh shell."
 
-eval_cmd $1
+# Run
+TEST_N=3
+TEST_1="sh_test"
+TEST_2="csh_test"
+TEST_3="ksh_test"
+TEST_3_SKIP="no ksh on FreeBSD"
+
+eval_cmd $*