diff options
Diffstat (limited to 'regress/Makefile')
-rw-r--r-- | regress/Makefile | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/regress/Makefile b/regress/Makefile index 6e2029348..623be8d82 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,8 +1,11 @@ | |||
1 | # $OpenBSD: Makefile,v 1.20 2003/01/08 23:54:22 djm 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 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | ||
4 | 5 | ||
5 | CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 | 6 | clean: |
7 | for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done | ||
8 | distclean: clean | ||
6 | 9 | ||
7 | LTESTS= connect \ | 10 | LTESTS= connect \ |
8 | proxy-connect \ | 11 | proxy-connect \ |
@@ -11,6 +14,7 @@ LTESTS= connect \ | |||
11 | proto-mismatch \ | 14 | proto-mismatch \ |
12 | exit-status \ | 15 | exit-status \ |
13 | transfer \ | 16 | transfer \ |
17 | rekey \ | ||
14 | stderr-data \ | 18 | stderr-data \ |
15 | stderr-after-eof \ | 19 | stderr-after-eof \ |
16 | broken-pipe \ | 20 | broken-pipe \ |
@@ -24,30 +28,34 @@ LTESTS= connect \ | |||
24 | keygen-change \ | 28 | keygen-change \ |
25 | sftp \ | 29 | sftp \ |
26 | sftp-cmds \ | 30 | sftp-cmds \ |
31 | sftp-badcmds \ | ||
27 | sftp-batch \ | 32 | sftp-batch \ |
33 | reconfigure \ | ||
34 | dynamic-forward \ | ||
28 | forwarding | 35 | forwarding |
29 | 36 | ||
30 | USER!= id -un | 37 | USER!= id -un |
31 | CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ | 38 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ |
39 | authorized_keys_${USER} known_hosts pidfile \ | ||
32 | ssh_config ssh_proxy sshd_config sshd_proxy \ | 40 | ssh_config ssh_proxy sshd_config sshd_proxy \ |
33 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 41 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
34 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 42 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
35 | ls.copy | 43 | ls.copy remote_pid |
36 | 44 | ||
37 | #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 45 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
38 | 46 | ||
39 | t1: | 47 | t1: |
40 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 48 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |
41 | 49 | ||
42 | t2: | 50 | t2: |
43 | cat ${.CURDIR}/rsa_openssh.prv > t2.out | 51 | cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out |
44 | chmod 600 t2.out | 52 | chmod 600 $(OBJ)/t2.out |
45 | ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub | 53 | ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub |
46 | 54 | ||
47 | t3: | 55 | t3: |
48 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\ | 56 | ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub |
49 | ssh-keygen -if /dev/stdin |\ | 57 | ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub |
50 | diff - ${.CURDIR}/rsa_openssh.pub | 58 | rm -f ${.CURDIR}/rsa_secsh.pub |
51 | 59 | ||
52 | t4: | 60 | t4: |
53 | ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ | 61 | ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ |
@@ -58,22 +66,21 @@ t5: | |||
58 | awk '{print $$2}' | diff - ${.CURDIR}/t5.ok | 66 | awk '{print $$2}' | diff - ${.CURDIR}/t5.ok |
59 | 67 | ||
60 | t6: | 68 | t6: |
61 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > t6.out1 | 69 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1 |
62 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > t6.out2 | 70 | ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2 |
63 | chmod 600 t6.out1 | 71 | chmod 600 $(OBJ)/t6.out1 |
64 | ssh-keygen -yf t6.out1 | diff - t6.out2 | 72 | ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2 |
65 | 73 | ||
66 | t7.out: | 74 | $(OBJ)/t7.out: |
67 | ssh-keygen -q -t rsa -N '' -f $@ | 75 | ssh-keygen -q -t rsa -N '' -f $@ |
68 | 76 | ||
69 | t7: t7.out | 77 | t7: $(OBJ)/t7.out |
70 | ssh-keygen -lf t7.out > /dev/null | 78 | ssh-keygen -lf $(OBJ)/t7.out > /dev/null |
71 | ssh-keygen -Bf t7.out > /dev/null | 79 | ssh-keygen -Bf $(OBJ)/t7.out > /dev/null |
72 | 80 | ||
73 | .for t in ${LTESTS} | 81 | t-exec: ${LTESTS:=.sh} |
74 | REGRESS_TARGETS+=t-${t} | 82 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
75 | t-${t}: | 83 | for TEST in ""$?; do \ |
76 | sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh | 84 | echo "run test $${TEST}" ... 1>&2; \ |
77 | .endfor | 85 | (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
78 | 86 | done | |
79 | .include "bsd.regress.mk" | ||