11 files changed, 16 insertions, 20 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/builtin/expected.status.1 b/tools/regression/usr.bin/make/shell/builtin/expected.status.1
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tools/regression/usr.bin/make/shell/builtin/expected.status.1
@@ -0,0 +1 @@
+0
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/builtin/expected.stderr.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ 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 $*