diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-09-04 15:37:58 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-09-04 15:37:58 +1000 |
commit | ebc3c13d40f36d0772ee8d204a19a1def0190754 (patch) | |
tree | d657c8f83c43955cf96b8360dad3cf3ce0824ea0 | |
parent | 6d3921f64bbdb304df9d8ef6887a46dacf3c60b9 (diff) |
- [regress/Makefile] Remove BSDisms.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/Makefile | 29 |
2 files changed, 19 insertions, 13 deletions
@@ -23,6 +23,7 @@ | |||
23 | - [regress/sftp-cmds.sh] Use portable "test" option. | 23 | - [regress/sftp-cmds.sh] Use portable "test" option. |
24 | - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always | 24 | - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always |
25 | use Strictmodes no, wait longer for sshd startup. | 25 | use Strictmodes no, wait longer for sshd startup. |
26 | - [regress/Makefile] Remove BSDisms. | ||
26 | 27 | ||
27 | 20030903 | 28 | 20030903 |
28 | - (djm) OpenBSD CVS Sync | 29 | - (djm) OpenBSD CVS Sync |
@@ -1013,4 +1014,4 @@ | |||
1013 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1014 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1014 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1015 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1015 | 1016 | ||
1016 | $Id: ChangeLog,v 1.2956 2003/09/04 05:35:48 dtucker Exp $ | 1017 | $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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ | 1 | # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 | 3 | OBJ ?= `pwd` |
4 | |||
5 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | ||
6 | tests: $(REGRESS_TARGETS) | ||
4 | 7 | ||
5 | CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 | 8 | CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 |
9 | clean: | ||
10 | @for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done | ||
11 | distclean: clean | ||
6 | 12 | ||
7 | LTESTS= connect \ | 13 | LTESTS= connect \ |
8 | proxy-connect \ | 14 | proxy-connect \ |
@@ -36,7 +42,7 @@ CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ | |||
36 | ssh_config ssh_proxy sshd_config sshd_proxy \ | 42 | ssh_config ssh_proxy sshd_config sshd_proxy \ |
37 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 43 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
38 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 44 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
39 | ls.copy | 45 | ls.copy remote_pid |
40 | 46 | ||
41 | #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 47 | #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
42 | 48 | ||
@@ -49,9 +55,9 @@ t2: | |||
49 | ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub | 55 | ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub |
50 | 56 | ||
51 | t3: | 57 | t3: |
52 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\ | 58 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub |
53 | ssh-keygen -if /dev/stdin |\ | 59 | ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub |
54 | diff - ${.CURDIR}/rsa_openssh.pub | 60 | rm -f ${.CURDIR}/rsa_secsh.pub |
55 | 61 | ||
56 | t4: | 62 | t4: |
57 | ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ | 63 | ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ |
@@ -74,10 +80,9 @@ t7: t7.out | |||
74 | ssh-keygen -lf t7.out > /dev/null | 80 | ssh-keygen -lf t7.out > /dev/null |
75 | ssh-keygen -Bf t7.out > /dev/null | 81 | ssh-keygen -Bf t7.out > /dev/null |
76 | 82 | ||
77 | .for t in ${LTESTS} | 83 | t-exec: ${LTESTS:=.sh} |
78 | REGRESS_TARGETS+=t-${t} | 84 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
79 | t-${t}: | 85 | for TEST in ""$?; do \ |
80 | sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh | 86 | echo "run test $${TEST}" ... 1>&2; \ |
81 | .endfor | 87 | (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
82 | 88 | done | |
83 | .include "bsd.regress.mk" | ||