diff options
Diffstat (limited to 'regress/Makefile')
-rw-r--r-- | regress/Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/regress/Makefile b/regress/Makefile index 196020db8..7b571f7ec 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,8 +1,11 @@ | |||
1 | # $OpenBSD: Makefile,v 1.43 2007/10/29 06:57:13 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
5 | 5 | ||
6 | # Interop tests are not run by default | ||
7 | interop: t-exec-interop | ||
8 | |||
6 | clean: | 9 | clean: |
7 | for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done | 10 | for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done |
8 | distclean: clean | 11 | distclean: clean |
@@ -45,6 +48,9 @@ LTESTS= connect \ | |||
45 | localcommand \ | 48 | localcommand \ |
46 | forcecommand | 49 | forcecommand |
47 | 50 | ||
51 | INTEROP_TESTS= putty-transfer putty-ciphers putty-kex | ||
52 | #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | ||
53 | |||
48 | USER!= id -un | 54 | USER!= id -un |
49 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | 55 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ |
50 | authorized_keys_${USER} known_hosts pidfile \ | 56 | authorized_keys_${USER} known_hosts pidfile \ |
@@ -55,8 +61,6 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | |||
55 | scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \ | 61 | scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \ |
56 | sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv | 62 | sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv |
57 | 63 | ||
58 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | ||
59 | |||
60 | t1: | 64 | t1: |
61 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 65 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |
62 | 66 | ||
@@ -97,3 +101,11 @@ t-exec: ${LTESTS:=.sh} | |||
97 | echo "run test $${TEST}" ... 1>&2; \ | 101 | echo "run test $${TEST}" ... 1>&2; \ |
98 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 102 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
99 | done | 103 | done |
104 | |||
105 | t-exec-interop: ${INTEROP_TESTS:=.sh} | ||
106 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | ||
107 | for TEST in ""$?; do \ | ||
108 | echo "run test $${TEST}" ... 1>&2; \ | ||
109 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | ||
110 | done | ||
111 | |||