diff options
Diffstat (limited to 'bin/sh/tests/parameters')
-rw-r--r-- | bin/sh/tests/parameters/Makefile | 2 | ||||
-rw-r--r-- | bin/sh/tests/parameters/Makefile.depend | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/env1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/exitstatus1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/ifs1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/mail1.0 | 3 | ||||
-rw-r--r-- | bin/sh/tests/parameters/mail2.0 | 3 | ||||
-rw-r--r-- | bin/sh/tests/parameters/optind1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/optind2.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional2.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional3.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional4.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional5.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional6.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional7.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional8.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/positional9.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/pwd1.0 | 1 | ||||
-rw-r--r-- | bin/sh/tests/parameters/pwd2.0 | 1 |
20 files changed, 2 insertions, 23 deletions
diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile index 939bd199a72b..50352c91b6f0 100644 --- a/bin/sh/tests/parameters/Makefile +++ b/bin/sh/tests/parameters/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/parameters/Makefile.depend b/bin/sh/tests/parameters/Makefile.depend index f80275d86ab1..11aba52f82cf 100644 --- a/bin/sh/tests/parameters/Makefile.depend +++ b/bin/sh/tests/parameters/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/bin/sh/tests/parameters/env1.0 b/bin/sh/tests/parameters/env1.0 index c0d4a2cc9141..ade1ed6249c6 100644 --- a/bin/sh/tests/parameters/env1.0 +++ b/bin/sh/tests/parameters/env1.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ export key='must contain this' unset x diff --git a/bin/sh/tests/parameters/exitstatus1.0 b/bin/sh/tests/parameters/exitstatus1.0 index 696823d58043..f3243926813c 100644 --- a/bin/sh/tests/parameters/exitstatus1.0 +++ b/bin/sh/tests/parameters/exitstatus1.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ f() { [ $? = $1 ] || exit 1 } diff --git a/bin/sh/tests/parameters/ifs1.0 b/bin/sh/tests/parameters/ifs1.0 index b93d99a8a8c7..9462a46e1ae9 100644 --- a/bin/sh/tests/parameters/ifs1.0 +++ b/bin/sh/tests/parameters/ifs1.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ env IFS=_ ${SH} -c ' rc=2 diff --git a/bin/sh/tests/parameters/mail1.0 b/bin/sh/tests/parameters/mail1.0 index 5791a5accc7c..42e712e31ac9 100644 --- a/bin/sh/tests/parameters/mail1.0 +++ b/bin/sh/tests/parameters/mail1.0 @@ -1,10 +1,9 @@ -# $FreeBSD$ # Test that a non-interactive shell does not access $MAIL. goodfile=/var/empty/sh-test-goodfile mailfile=/var/empty/sh-test-mailfile T=$(mktemp sh-test.XXXXXX) || exit -MAIL=$mailfile ktrace -i -f "$T" ${SH} -c "[ -s $goodfile ]" 2>/dev/null +MAIL=$mailfile ktrace -t n -i -f "$T" ${SH} -c "[ -s $goodfile ]" 3>/dev/null if ! grep -q $goodfile "$T"; then # ktrace problem rc=0 diff --git a/bin/sh/tests/parameters/mail2.0 b/bin/sh/tests/parameters/mail2.0 index 343c99de9b27..b1f48e0b29db 100644 --- a/bin/sh/tests/parameters/mail2.0 +++ b/bin/sh/tests/parameters/mail2.0 @@ -1,10 +1,9 @@ -# $FreeBSD$ # Test that an interactive shell accesses $MAIL. goodfile=/var/empty/sh-test-goodfile mailfile=/var/empty/sh-test-mailfile T=$(mktemp sh-test.XXXXXX) || exit -ENV=$goodfile MAIL=$mailfile ktrace -i -f "$T" ${SH} +m -i </dev/null >/dev/null 2>&1 +ENV=$goodfile MAIL=$mailfile ktrace -t n -i -f "$T" ${SH} +m -i </dev/null >/dev/null 2>&1 if ! grep -q $goodfile "$T"; then # ktrace problem rc=0 diff --git a/bin/sh/tests/parameters/optind1.0 b/bin/sh/tests/parameters/optind1.0 index 33e0288e861f..516f124c38a7 100644 --- a/bin/sh/tests/parameters/optind1.0 +++ b/bin/sh/tests/parameters/optind1.0 @@ -1,3 +1,2 @@ -# $FreeBSD$ unset OPTIND && [ -z "$OPTIND" ] diff --git a/bin/sh/tests/parameters/optind2.0 b/bin/sh/tests/parameters/optind2.0 index a7689f6841a5..3ca60ba6f78d 100644 --- a/bin/sh/tests/parameters/optind2.0 +++ b/bin/sh/tests/parameters/optind2.0 @@ -1,3 +1,2 @@ -# $FreeBSD$ [ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ] diff --git a/bin/sh/tests/parameters/positional1.0 b/bin/sh/tests/parameters/positional1.0 index 67d19516a5d9..0186ffbd6d55 100644 --- a/bin/sh/tests/parameters/positional1.0 +++ b/bin/sh/tests/parameters/positional1.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ set -- a b c d e f g h i j [ "$1" = a ] || echo "error at line $LINENO" diff --git a/bin/sh/tests/parameters/positional2.0 b/bin/sh/tests/parameters/positional2.0 index fcec2a4b676e..88bd93dcfe6c 100644 --- a/bin/sh/tests/parameters/positional2.0 +++ b/bin/sh/tests/parameters/positional2.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ failures='' ok='' diff --git a/bin/sh/tests/parameters/positional3.0 b/bin/sh/tests/parameters/positional3.0 index 1200469b4e12..28311fa2ee1a 100644 --- a/bin/sh/tests/parameters/positional3.0 +++ b/bin/sh/tests/parameters/positional3.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b) [ "$r" = yesyes ] diff --git a/bin/sh/tests/parameters/positional4.0 b/bin/sh/tests/parameters/positional4.0 index c1c380c0feac..1b290b99da0c 100644 --- a/bin/sh/tests/parameters/positional4.0 +++ b/bin/sh/tests/parameters/positional4.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ set -- "x$0" 2 3 4 5 6 7 8 9 "y$0" [ "${01}.${010}" = "$1.${10}" ] diff --git a/bin/sh/tests/parameters/positional5.0 b/bin/sh/tests/parameters/positional5.0 index eeaaba5321ff..ac6471ed57fd 100644 --- a/bin/sh/tests/parameters/positional5.0 +++ b/bin/sh/tests/parameters/positional5.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ i=1 r=0 diff --git a/bin/sh/tests/parameters/positional6.0 b/bin/sh/tests/parameters/positional6.0 index 1410668b8a9f..43df962106b3 100644 --- a/bin/sh/tests/parameters/positional6.0 +++ b/bin/sh/tests/parameters/positional6.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ IFS=? set p r diff --git a/bin/sh/tests/parameters/positional7.0 b/bin/sh/tests/parameters/positional7.0 index f170ad343996..8a21da97973e 100644 --- a/bin/sh/tests/parameters/positional7.0 +++ b/bin/sh/tests/parameters/positional7.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ set -- / '' IFS=* diff --git a/bin/sh/tests/parameters/positional8.0 b/bin/sh/tests/parameters/positional8.0 index 4c4dbd5cf1a6..1b1b941c8ee6 100644 --- a/bin/sh/tests/parameters/positional8.0 +++ b/bin/sh/tests/parameters/positional8.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ failures='' ok='' diff --git a/bin/sh/tests/parameters/positional9.0 b/bin/sh/tests/parameters/positional9.0 index 8571bfaf6135..823995f0c783 100644 --- a/bin/sh/tests/parameters/positional9.0 +++ b/bin/sh/tests/parameters/positional9.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ # Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified, # make sure it is at least numeric. diff --git a/bin/sh/tests/parameters/pwd1.0 b/bin/sh/tests/parameters/pwd1.0 index 0099379a9d3c..cd0d8329cd8c 100644 --- a/bin/sh/tests/parameters/pwd1.0 +++ b/bin/sh/tests/parameters/pwd1.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ # Check that bogus PWD values are not accepted from the environment. cd / || exit 3 diff --git a/bin/sh/tests/parameters/pwd2.0 b/bin/sh/tests/parameters/pwd2.0 index 2297f8b753d4..69ab5c896f9e 100644 --- a/bin/sh/tests/parameters/pwd2.0 +++ b/bin/sh/tests/parameters/pwd2.0 @@ -1,4 +1,3 @@ -# $FreeBSD$ # Check that PWD is exported and accepted from the environment. set -e |