aboutsummaryrefslogtreecommitdiff
path: root/tools/regression/usr.bin/make/shell
diff options
context:
space:
mode:
authorJulio Merino <jmmv@FreeBSD.org>2014-03-19 12:29:20 +0000
committerJulio Merino <jmmv@FreeBSD.org>2014-03-19 12:29:20 +0000
commitd525bcd959742df2fe7f3dbcd251284537121190 (patch)
treea2679f017f077e354a85651417b67b88de3d18e8 /tools/regression/usr.bin/make/shell
parentf743627b41d885b1f6ff1e5cc085eeb78ec20372 (diff)
Notes
Diffstat (limited to 'tools/regression/usr.bin/make/shell')
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/Makefile18
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.stdout.11
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/expected.stdout.21
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/sh6
-rw-r--r--tools/regression/usr.bin/make/shell/builtin/test.t19
-rw-r--r--tools/regression/usr.bin/make/shell/meta/Makefile18
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.stdout.11
-rw-r--r--tools/regression/usr.bin/make/shell/meta/expected.stdout.21
-rw-r--r--tools/regression/usr.bin/make/shell/meta/sh6
-rw-r--r--tools/regression/usr.bin/make/shell/meta/test.t19
-rw-r--r--tools/regression/usr.bin/make/shell/path/Makefile31
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.stdout.11
-rw-r--r--tools/regression/usr.bin/make/shell/path/expected.stdout.21
-rw-r--r--tools/regression/usr.bin/make/shell/path/sh6
-rw-r--r--tools/regression/usr.bin/make/shell/path/test.t22
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/Makefile31
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.stdout.11
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/expected.stdout.21
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/shell6
-rw-r--r--tools/regression/usr.bin/make/shell/path_select/test.t21
-rw-r--r--tools/regression/usr.bin/make/shell/replace/Makefile21
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.stdout.13
-rw-r--r--tools/regression/usr.bin/make/shell/replace/expected.stdout.26
-rw-r--r--tools/regression/usr.bin/make/shell/replace/shell6
-rw-r--r--tools/regression/usr.bin/make/shell/replace/test.t19
-rw-r--r--tools/regression/usr.bin/make/shell/select/Makefile28
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.status.11
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.status.21
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.stderr.10
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.stderr.20
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.stdout.11
-rw-r--r--tools/regression/usr.bin/make/shell/select/expected.stdout.21
-rw-r--r--tools/regression/usr.bin/make/shell/select/test.t18
53 files changed, 0 insertions, 326 deletions
diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/tools/regression/usr.bin/make/shell/builtin/Makefile
deleted file mode 100644
index 03764784e1a0..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# In compat mode (the default without -j) a line that contains no shell
-# meta characters and no shell builtins is not passed to the shell but
-# executed directly. In our example the ls line without meta characters
-# will really execute ls, while the line with meta characters will execute
-# our special shell.
-#
-# $FreeBSD$
-
-.SHELL: path="${.CURDIR}/sh"
-
-.PHONY: builtin no-builtin
-
-builtin:
- @exec ls -d .
-
-no-builtin:
- @ls -d .
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 b/tools/regression/usr.bin/make/shell/builtin/expected.status.1
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
deleted file mode 100644
index 9c558e357c41..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
+++ /dev/null
@@ -1 +0,0 @@
-.
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
deleted file mode 100644
index e350eaf8c7ea..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
+++ /dev/null
@@ -1 +0,0 @@
--ec exec ls -d .
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/tools/regression/usr.bin/make/shell/builtin/sh
deleted file mode 100644
index 3a507b87f674..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-echo "$@"
-if ! test -t 0 ; then
- cat
-fi
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/tools/regression/usr.bin/make/shell/builtin/test.t
deleted file mode 100644
index 1798afcc3207..000000000000
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="Check that a command line with a builtin is passed to the shell."
-
-# 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
deleted file mode 100644
index bcf19d052bbc..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# In compat mode (the default without -j) a line that contains no shell
-# meta characters and no shell builtins is not passed to the shell but
-# executed directly. In our example the ls line without meta characters
-# will really execute ls, while the line with meta characters will execute
-# our special shell.
-#
-# $FreeBSD$
-
-.SHELL: path="${.OBJDIR}/sh"
-
-.PHONY: meta no-meta
-
-meta:
- @ls *
-
-no-meta:
- @ls -d .
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/tools/regression/usr.bin/make/shell/meta/expected.status.1
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 b/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 b/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
deleted file mode 100644
index 9c558e357c41..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
+++ /dev/null
@@ -1 +0,0 @@
-.
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
deleted file mode 100644
index 6ac6f19502a5..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
+++ /dev/null
@@ -1 +0,0 @@
--ec ls *
diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/tools/regression/usr.bin/make/shell/meta/sh
deleted file mode 100644
index 3a507b87f674..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-echo "$@"
-if ! test -t 0 ; then
- cat
-fi
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/tools/regression/usr.bin/make/shell/meta/test.t
deleted file mode 100644
index 588b73ccc9f6..000000000000
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="Check that a command line with meta characters is passed to the shell."
-
-# 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
deleted file mode 100644
index fe40b645510e..000000000000
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Change the path for builtin shells. There are two methods to do this.
-# This is the first of them when the basename of the path is equal to
-# one of the builtin shells so that the .SHELL target automatically
-# also selectes the shell without specifying the name.
-#
-# Be sure to include a meta-character into the command line, so that
-# really our shell is executed.
-#
-# $FreeBSD$
-#
-
-.ifmake sh_test
-
-.SHELL: path=${.OBJDIR}/sh
-sh_test:
- @: This is the shell.
-
-.elifmake csh_test
-
-.SHELL: path=${.OBJDIR}/csh
-csh_test:
- @: This is the C-shell.
-
-.elifmake ksh_test
-
-.SHELL: path=${.OBJDIR}/ksh
-ksh_test:
- @: This is the Korn-shell.
-
-.endif
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/tools/regression/usr.bin/make/shell/path/expected.status.1
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 b/tools/regression/usr.bin/make/shell/path/expected.stderr.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.1
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 b/tools/regression/usr.bin/make/shell/path/expected.stderr.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.2
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/tools/regression/usr.bin/make/shell/path/expected.stdout.1
deleted file mode 100644
index d881364744b2..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.1
+++ /dev/null
@@ -1 +0,0 @@
--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
deleted file mode 100644
index de3fc89cc9e2..000000000000
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.2
+++ /dev/null
@@ -1 +0,0 @@
--ec : This is the C-shell.
diff --git a/tools/regression/usr.bin/make/shell/path/sh b/tools/regression/usr.bin/make/shell/path/sh
deleted file mode 100644
index 46169eb6efc2..000000000000
--- a/tools/regression/usr.bin/make/shell/path/sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-echo $@
-if ! test -t 0 ; then
- cat
-fi
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/tools/regression/usr.bin/make/shell/path/test.t
deleted file mode 100644
index 72ff252af70e..000000000000
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="New path for builtin shells."
-
-# 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
deleted file mode 100644
index 05cfb27f3fd9..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Change the path for builtin shells. There are two methods to do this.
-# This is the second of them when both a path and a name are specified.
-# This selects a builtin shell according to the name, but executes it
-# from the specified path.
-#
-# Be sure to include a meta-character into the command line, so that
-# really our shell is executed.
-#
-# $FreeBSD$
-#
-
-.ifmake sh_test
-
-.SHELL: name=sh path=${.CURDIR}/shell
-sh_test:
- @: This is the shell.
-
-.elifmake csh_test
-
-.SHELL: name=csh path=${.CURDIR}/shell
-csh_test:
- @: This is the C-shell.
-
-.elifmake ksh_test
-
-.SHELL: name=ksh path=${.CURDIR}/shell
-ksh_test:
- @: This is the Korn-shell.
-
-.endif
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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-0
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
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1
+++ /dev/null
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
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2
+++ /dev/null
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
deleted file mode 100644
index d881364744b2..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1
+++ /dev/null
@@ -1 +0,0 @@
--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
deleted file mode 100644
index de3fc89cc9e2..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2
+++ /dev/null
@@ -1 +0,0 @@
--ec : This is the C-shell.
diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/tools/regression/usr.bin/make/shell/path_select/shell
deleted file mode 100644
index 46169eb6efc2..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/shell
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-echo $@
-if ! test -t 0 ; then
- cat
-fi
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/tools/regression/usr.bin/make/shell/path_select/test.t
deleted file mode 100644
index 5bac6316722e..000000000000
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="New path for builtin shells (2)."
-
-# 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
deleted file mode 100644
index 2160dbfb5776..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Test that we can replace the shell and set all the shell parameters
-# (except meta and builtin which have their own test). This is done by
-# using a shell script for the shell that echoes all command line
-# arguments and its standard input. The shell name should not be one of
-# the builtin shells.
-#
-# XXX There seems to be a problem here in -j1 mode: for the line without
-# @- make should switch on echoing again, but it doesn't.
-#
-# $FreeBSD$
-
-.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"
-
-.PHONY: test1
-test1:
- -@funny $$
- funnier $$
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/tools/regression/usr.bin/make/shell/replace/expected.status.1
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
deleted file mode 100644
index eff99ea17ab2..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
+++ /dev/null
@@ -1,3 +0,0 @@
--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
deleted file mode 100644
index c79a09af2916..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2
+++ /dev/null
@@ -1,6 +0,0 @@
--yx
-be quiet
-ignore errors
-funny $
-check errors
-funnier $
diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/tools/regression/usr.bin/make/shell/replace/shell
deleted file mode 100644
index 46169eb6efc2..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/shell
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-echo $@
-if ! test -t 0 ; then
- cat
-fi
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/tools/regression/usr.bin/make/shell/replace/test.t
deleted file mode 100644
index 5c91cf9e03e8..000000000000
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="Check that the shell can be replaced."
-
-# 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
deleted file mode 100644
index e1ff0231c737..000000000000
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# We just select the builtin shells and check whether it is really
-# executed. This should print just the shell paths. Because we
-# normally don't have a ksh, we make this test conditional. This means
-# one has to recreate the test results once ksh is installed.
-#
-# $FreeBSD$
-#
-
-.ifmake sh_test
-
-.SHELL: name=sh
-sh_test: print_path
-
-.elifmake csh_test
-
-.SHELL: name=csh
-csh_test: print_path
-
-.elifmake ksh_test
-
-.SHELL: name=ksh
-ksh_test: print_path
-
-.endif
-
-print_path:
- @ps -opid,command | awk '$$1=='$$$$' { print $$2; }'
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/tools/regression/usr.bin/make/shell/select/expected.status.1
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.status.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 573541ac9702..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.status.2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.1
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/tools/regression/usr.bin/make/shell/select/expected.stderr.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.2
+++ /dev/null
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/tools/regression/usr.bin/make/shell/select/expected.stdout.1
deleted file mode 100644
index c2cdaa0f27c1..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.1
+++ /dev/null
@@ -1 +0,0 @@
-/bin/sh
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 b/tools/regression/usr.bin/make/shell/select/expected.stdout.2
deleted file mode 100644
index 5a831e82da12..000000000000
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.2
+++ /dev/null
@@ -1 +0,0 @@
-/bin/csh
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/tools/regression/usr.bin/make/shell/select/test.t
deleted file mode 100644
index 7f73f9b24e25..000000000000
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-cd `dirname $0`
-. ../../common.sh
-
-# Description
-DESC="Select the builtin sh shell."
-
-# 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 $*