11 files changed, 23 insertions, 20 deletions

diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/tools/regression/usr.bin/make/shell/replace/Makefile
index f903f374646cd..2160dbfb57762 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 0cfbf08886fca..0000000000000
--- 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 0000000000000..573541ac9702d
--- /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 0000000000000..573541ac9702d
--- /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 628ea8fef6c77..0000000000000
--- 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.stdout b/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
index e69de29bb2d1d..e69de29bb2d1d 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout
+++ 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 0000000000000..e69de29bb2d1d
--- /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 0000000000000..eff99ea17ab2a
--- /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 0000000000000..c79a09af29165
--- /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 46169eb6efc2b..46169eb6efc2b 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 838a605796432..5c91cf9e03e86 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 $*