Move TEST.sh to regress/bin/test/ and remove bin/test/TEST.*. ok?
Index: regress/bin/test/Makefile --- /dev/null +++ regress/bin/test/Makefile @@ -0,0 +1,8 @@ +# $OpenBSD$ + +REGRESS_TARGETS= run_test + +run_test: + @test=/bin/test /bin/sh TEST.sh >/dev/null + +.include <bsd.regress.mk> Index: regress/bin/test/TEST.sh --- /dev/null +++ regress/bin/test/TEST.sh @@ -0,0 +1,139 @@ +#!/bin/sh +# +# Copyright (c) June 1996 Wolfram Schneider <[email protected]>. 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" +[ $ERROR -gt 0 ] && exit 1 +[ $FAILED -gt 0 ] && exit 1 +exit 0 Index: bin/test/TEST.README =================================================================== RCS file: bin/test/TEST.README diff -N bin/test/TEST.README --- bin/test/TEST.README 18 Jun 1997 20:44:27 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -# $OpenBSD: TEST.README,v 1.4 1997/06/18 20:44:27 kstailey Exp $ - -OS/shell syntax error failed --------------------------------------------------------------------- -OpenBSD 2.0 /bin/test 6 0 -bash 1.14.5 3 0 -bash 2.0 0 0 -pdksh 5.2.12 6 0 -zsh 2.6-beta17 6 4 -FreeBSD 2.1 /bin/test 8 0 -HP-UX 10.10 ksh 1 0 -HP-UX 10.10 sh 3 0 -HP-UX 10.10 /usr/bin/test 6 2 -IRIX 5.3 ksh 3 0 -IRIX 5.3 sh 3 0 -IRIX 5.3 /usr/bin/test 11 3 -IRIX 6.2 ksh 3 0 -IRIX 6.2 sh 3 0 -IRIX 6.2 /usr/bin/test 14 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 -SunOS 4.1.3_U1 sh 3 0 -SunOS 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 Index: bin/test/TEST.csh =================================================================== RCS file: bin/test/TEST.csh diff -N bin/test/TEST.csh --- bin/test/TEST.csh 23 Jan 1997 17:42:52 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,153 +0,0 @@ -# $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 - -#alias t '/usr/src/bin/test/obj/test \!*; echo $status' -alias t '/bin/test \!*; echo $status' - -echo 't -b /dev/ttyp2' -t -b /dev/ttyp2 -echo 't -b /dev/jb1a' -t -b /dev/jb1a - -echo 't -c test.c' -t -c test.c -echo 't -c /dev/tty' -t -c /dev/tty - -echo 't -d test.c' -t -d test.c -echo 't -d /etc' -t -d /etc - -echo 't -e noexist' -t -e noexist -echo 't -e test.c' -t -e test.c - -echo 't -f noexist' -t -f noexist -echo 't -f /dev/tty' -t -f /dev/tty -echo 't -f test.c' -t -f test.c - -echo 't -g test.c' -t -g test.c -echo 't -g /bin/ps' -t -g /bin/ps - -echo 't -n ""' -t -n "" -echo 't -n "hello"' -t -n "hello" - -echo 't -p test.c' -t -p test.c - -echo 't -r noexist' -t -r noexist -echo 't -r /etc/master.passwd' -t -r /etc/master.passwd -echo 't -r test.c' -t -r test.c - -echo 't -s noexist' -t -s noexist -echo 't -s /dev/null' -t -s /dev/null -echo 't -s test.c' -t -s test.c - -echo 't -t 20' -t -t 20 -echo 't -t 0' -t -t 0 - -echo 't -u test.c' -t -u test.c -echo 't -u /bin/rcp' -t -u /bin/rcp - -echo 't -w noexist' -t -w noexist -echo 't -w /etc/master.passwd' -t -w /etc/master.passwd -echo 't -w /dev/null' -t -w /dev/null - -echo 't -x noexist' -t -x noexist -echo 't -x /bin/ps' -t -x /bin/ps -echo 't -x /etc/motd' -t -x /etc/motd - -echo 't -z ""' -t -z "" -echo 't -z "foo"' -t -z "foo" - -echo 't "foo"' -t "foo" -echo 't ""' -t "" - -echo 't "hello" = "hello"' -t "hello" = "hello" -echo 't "hello" = "goodbye"' -t "hello" = "goodbye" - -echo 't "hello" != "hello"' -t "hello" != "hello" -echo 't "hello" != "goodbye"' -t "hello" != "goodbye" - -echo 't 200 -eq 200' -t 200 -eq 200 -echo 't 34 -eq 222' -t 34 -eq 222 - -echo 't 200 -ne 200' -t 200 -ne 200 -echo 't 34 -ne 222' -t 34 -ne 222 - -echo 't 200 -gt 200' -t 200 -gt 200 -echo 't 340 -gt 222' -t 340 -gt 222 - -echo 't 200 -ge 200' -t 200 -ge 200 -echo 't 34 -ge 222' -t 34 -ge 222 - -echo 't 200 -lt 200' -t 200 -lt 200 -echo 't 34 -lt 222' -t 34 -lt 222 - -echo 't 200 -le 200' -t 200 -le 200 -echo 't 340 -le 222' -t 340 -le 222 - -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 "" - Index: bin/test/TEST.sh =================================================================== RCS file: bin/test/TEST.sh diff -N bin/test/TEST.sh --- bin/test/TEST.sh 23 Jan 1997 17:42:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,136 +0,0 @@ -#!/bin/sh -# -# Copyright (c) June 1996 Wolfram Schneider <[email protected]>. 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"
