From ebc3c13d40f36d0772ee8d204a19a1def0190754 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 4 Sep 2003 15:37:58 +1000
Subject: [PATCH]    - [regress/Makefile] Remove BSDisms.

---
 ChangeLog        |  3 ++-
 regress/Makefile | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8c93d16e..858e595c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
    - [regress/sftp-cmds.sh] Use portable "test" option.
    - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always
      use Strictmodes no, wait longer for sshd startup.
+   - [regress/Makefile] Remove BSDisms.
 
 20030903
  - (djm) OpenBSD CVS Sync
@@ -1013,4 +1014,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2956 2003/09/04 05:35:48 dtucker Exp $
+$Id: ChangeLog,v 1.2957 2003/09/04 05:37:58 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index c3baf78a1..3e6a2483e 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,8 +1,14 @@
 #	$OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
 
-REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
+OBJ ?= `pwd`
+
+REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
+tests:		$(REGRESS_TARGETS)
 
 CLEANFILES+=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
+clean:
+	@for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done
+distclean:	clean
 
 LTESTS= 	connect \
 		proxy-connect \
@@ -36,7 +42,7 @@ CLEANFILES+=	authorized_keys_${USER} known_hosts pidfile \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
-		ls.copy
+		ls.copy remote_pid
 
 #LTESTS+=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
@@ -49,9 +55,9 @@ t2:
 	ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
-	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\
-		ssh-keygen -if /dev/stdin |\
-		diff - ${.CURDIR}/rsa_openssh.pub
+	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
+	ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
+	rm -f ${.CURDIR}/rsa_secsh.pub
 
 t4:
 	ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
@@ -74,10 +80,9 @@ t7: t7.out
 	ssh-keygen -lf t7.out > /dev/null
 	ssh-keygen -Bf t7.out > /dev/null
 
-.for t in ${LTESTS}
-REGRESS_TARGETS+=t-${t}
-t-${t}:
-	sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh
-.endfor
-
-.include "bsd.regress.mk"
+t-exec:	${LTESTS:=.sh}
+	@if [ "x$?" = "x" ]; then exit 0; fi; \
+	for TEST in ""$?; do \
+		echo "run test $${TEST}" ... 1>&2; \
+		(sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+	done