aboutsummaryrefslogtreecommitdiff
path: root/tools/regression/usr.bin/make/shell/path
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/path
parentf743627b41d885b1f6ff1e5cc085eeb78ec20372 (diff)
Notes
Diffstat (limited to 'tools/regression/usr.bin/make/shell/path')
-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
9 files changed, 0 insertions, 63 deletions
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 $*