Move test(1) test into regress.

ok deraadt

5 files changed, 14 insertions, 188 deletions

diff --git a/bin/test/TEST.README b/bin/test/TEST.README
deleted file mode 100644
index 79a7be4a415..00000000000
--- a/bin/test/TEST.README
+++ /dev/null
@@ -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
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
deleted file mode 100644
index b2f570bedd9..00000000000
--- a/bin/test/TEST.csh
+++ /dev/null
@@ -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 ""
-
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/bin/test/TEST.sh b/regress/bin/test/TEST.sh
index b7069961492..e1ae8bfdcb0 100644
--- a/bin/test/TEST.sh
+++ b/regress/bin/test/TEST.sh
@@ -26,7 +26,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $OpenBSD: TEST.sh,v 1.1 1997/01/23 17:42:53 millert Exp $
+# $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}		
@@ -134,3 +134,6 @@ t 0 '! ""'
 
 echo ""
 echo "Syntax errors: $ERROR Failed: $FAILED"
+[ $ERROR -gt 0 ] && exit 1
+[ $FAILED -gt 0 ] && exit 1
+exit 0