From b1525cdbdd51bb9bc6a0e0178c57eb3c36b3825e Mon Sep 17 00:00:00 2001 From: millert Date: Thu, 23 Jan 1997 17:42:52 +0000 Subject: [PATCH] sh-based TEST suite and man page clarifications from FreeBSD --- bin/test/TEST.README | 25 ++++++++ bin/test/TEST.csh | 16 ++++- bin/test/TEST.sh | 136 +++++++++++++++++++++++++++++++++++++++++++ bin/test/test.1 | 6 +- 4 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 bin/test/TEST.README create mode 100644 bin/test/TEST.sh diff --git a/bin/test/TEST.README b/bin/test/TEST.README new file mode 100644 index 00000000000..af1486d0477 --- /dev/null +++ b/bin/test/TEST.README @@ -0,0 +1,25 @@ +# $OpenBSD: TEST.README,v 1.1 1997/01/23 17:42:52 millert Exp $ + +OS/shell syntax error failed +-------------------------------------------------------------------- +OpenBSD 2.0 /bin/test 6 0 +bash 1.14.5 3 0 +pdksh 5.2.12 6 0 +zsh 2.6-beta17 6 4 +FreeBSD 2.1 /bin/test 8 0 +IRIX 5.3 ksh 3 0 +IRIX 5.3 sh 3 0 +IRIX 5.3 /usr/bin/test 11 3 +SunOS 5.4 ksh 3 0 +SunOS 5.4 sh 3 0 +SunOS 5.4 /usr/ucb/test 3 0 +SunOS 5.5 ksh 0 0 +SunOS 5.5 sh 3 0 +SunOS 5.5 /usr/ucb/test 3 0 +SunOP 4.1.3_U1 sh 3 0 +SunOP 4.1.3_U1 /usr/bin/test 3 0 +ULTRIX 4.2 /bin/test 9 0 +ULTRIX 4.2 ksh 1 0 +ULTRIX 4.2 sh5 4 0 + +96/06/16 diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh index fd13b41b546..b2f570bedd9 100644 --- a/bin/test/TEST.csh +++ b/bin/test/TEST.csh @@ -1,4 +1,4 @@ -# $OpenBSD: TEST.csh,v 1.2 1996/06/23 14:21:57 deraadt Exp $ +# $OpenBSD: TEST.csh,v 1.3 1997/01/23 17:42:52 millert Exp $ # $NetBSD: TEST.csh,v 1.2 1995/03/21 07:03:59 cgd Exp $ # @(#)TEST.csh 5.2 (Berkeley) 4/30/93 @@ -137,3 +137,17 @@ echo 't 700 -le 1000 -a -n "1" -a "20" = "20"' t 700 -le 1000 -a -n "1" -a "20" = "20" echo 't ! \( 700 -le 1000 -a -n "1" -a "20" = "20" \)' t ! \( 700 -le 1000 -a -n "1" -a "20" = "20" \) + +echo 't -5 -eq 5' +t -5 -eq 5 + + +echo 't foo -a ""' +t foo -a "" +echo 't "" -a foo' +t "" -a foo +echo 't "" -a ""' +t "" -a "" +echo 't "" -o ""' +t "" -o "" + diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh new file mode 100644 index 00000000000..b7069961492 --- /dev/null +++ b/bin/test/TEST.sh @@ -0,0 +1,136 @@ +#!/bin/sh +# +# Copyright (c) June 1996 Wolfram Schneider . Berlin. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# TEST.sh - check if test(1) or builtin test works +# +# $OpenBSD: TEST.sh,v 1.1 1997/01/23 17:42:53 millert Exp $ + +# force a specified test program, e.g. `env test=/bin/test sh TEST.sh' +: ${test=test} + +ERROR=0 FAILED=0 + +t () +{ + # $1 -> exit code + # $2 -> $test expression + + echo -n "$1: $test $2 " + + # check for syntax errors + syntax="`eval $test $2 2>&1`" + if test -z "$syntax"; then + + case $1 in + 0) if eval $test $2; then echo " OK"; else failed;fi;; + 1) if eval $test $2; then failed; else echo " OK";fi;; + esac + + else + error + fi +} + +error () +{ + echo ""; echo " $syntax" + ERROR=`expr $ERROR + 1` +} + +failed () +{ + echo ""; echo " failed" + FAILED=`expr $FAILED + 1` +} + + +t 0 'b = b' +t 1 'b != b' +t 0 '\( b = b \)' +t 1 '! \( b = b \)' +t 1 '! -f /etc/passwd' + +t 0 '-h = -h' +t 0 '-o = -o' +t 1 '-f = h' +t 1 '-h = f' +t 1 '-o = f' +t 1 'f = -o' +t 0 '\( -h = -h \)' +t 1 '\( a = -h \)' +t 1 '\( -f = h \)' +t 0 '-h = -h -o a' +t 0 '\( -h = -h \) -o 1' +t 0 '-h = -h -o -h = -h' +t 0 '\( -h = -h \) -o \( -h = -h \)' +t 0 'roedelheim = roedelheim' +t 1 'potsdam = berlin-dahlem' + +t 0 '-d /' +t 0 '-d / -a a != b' +t 1 '-z "-z"' +t 0 '-n -n' + +t 0 '0' +t 0 '\( 0 \)' +t 0 '-E' +t 0 '-X -a -X' +t 0 '-XXX' +t 0 '\( -E \)' +t 0 'true -o X' +t 0 'true -o -X' +t 0 '\( \( \( a = a \) -o 1 \) -a 1 \) -a true' +t 1 '-h /' +t 0 '-r /' +t 1 '-w /' +t 0 '-x /bin/sh' +t 0 '-c /dev/null' +t 0 '-b /dev/fd0a -o -b /dev/rfd0a -o true' +t 0 '-f /etc/passwd' +t 0 '-s /etc/passwd' + +t 1 '! \( 700 -le 1000 -a -n "1" -a "20" = "20" \)' +t 0 '100 -eq 100' +t 0 '100 -lt 200' +t 1 '1000 -lt 200' +t 0 '1000 -gt 200' +t 0 '1000 -ge 200' +t 0 '1000 -ge 1000' +t 1 '2 -ne 2' +t 0 '0 -eq 0' +t 1 '-5 -eq 5' +t 0 '\( 0 -eq 0 \)' +t 1 '1 -eq 0 -o a = a -a 1 -eq 0 -o a = aa' + +t 1 '"" -o ""' +t 1 '"" -a ""' +t 1 '"a" -a ""' +t 0 '"a" -a ! ""' +t 1 '""' +t 0 '! ""' + +echo "" +echo "Syntax errors: $ERROR Failed: $FAILED" diff --git a/bin/test/test.1 b/bin/test/test.1 index b39808839ae..8afc99e2f6c 100644 --- a/bin/test/test.1 +++ b/bin/test/test.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: test.1,v 1.3 1996/06/23 14:21:57 deraadt Exp $ +.\" $OpenBSD: test.1,v 1.4 1997/01/23 17:42:53 millert Exp $ .\" $NetBSD: test.1,v 1.6 1995/03/21 07:04:03 cgd Exp $ .\" .\" Copyright (c) 1991, 1993 @@ -122,7 +122,7 @@ than zero. True if the file whose file descriptor number is .Ar file_descriptor -is open and is associated with a terminal. +(default 1) is open and is associated with a terminal. .It Fl u Ar file True if .Ar file @@ -290,7 +290,7 @@ The grammar is inherently ambiguous. In order to assure a degree of consistency, the cases described in .St -p1003.2 -section 4.62.4, +section D11.2/4.62.4, are evaluated consistently according to the rules specified in the standards document. All other cases are subject to the ambiguity in the command semantics. -- 2.20.1