Move test(1) test into regress.

ok deraadt

3 files changed, 149 insertions, 2 deletions

diff --git a/regress/bin/Makefile b/regress/bin/Makefile
index bc5937509bb..0b3797dafab 100644
--- a/regress/bin/Makefile
+++ b/regress/bin/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.5 2005/04/14 15:17:07 cloder Exp $
+#	$OpenBSD: Makefile,v 1.6 2011/07/09 03:58:12 nicm Exp $
 
-SUBDIR+= md5 ksh pax systrace
+SUBDIR+= md5 ksh pax systrace test
 
 install:
 
diff --git a/regress/bin/test/Makefile b/regress/bin/test/Makefile
new file mode 100644
index 00000000000..6d77158cf0c
--- /dev/null
+++ b/regress/bin/test/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD: Makefile,v 1.1 2011/07/09 03:58:12 nicm Exp $
+
+REGRESS_TARGETS=	run_test
+
+run_test:
+	test=/bin/test /bin/sh TEST.sh >/dev/null
+
+.include <bsd.regress.mk>
diff --git a/regress/bin/test/TEST.sh b/regress/bin/test/TEST.sh
new file mode 100644
index 00000000000..e1ae8bfdcb0
--- /dev/null
+++ b/regress/bin/test/TEST.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+#
+# Copyright (c) June 1996 Wolfram Schneider <wosch@FreeBSD.org>. 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 2011/07/09 03:58:12 nicm 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