- [regress/Makefile] Remove BSDisms.
diff --git a/regress/Makefile b/regress/Makefile
index c3baf78..3e6a248 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 @@
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 @@
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 @@
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