1 files changed, 22 insertions, 4 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 539956398..3b8ea245b 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,10 +1,15 @@
-#       $OpenBSD: Makefile,v 1.42 2006/07/19 13:34:52 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.48 2008/06/28 13:57:25 djm Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
 
+# Interop tests are not run by default
+interop interop-tests: t-exec-interop
+
 clean:
         for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
+        rm -rf $(OBJ).putty
+
 distclean:      clean
 
 LTESTS=         connect \
@@ -29,6 +34,7 @@ LTESTS= 	connect \
                 agent-ptrace \
                 keyscan \
                 keygen-change \
+                key-options \
                 scp \
                 sftp \
                 sftp-cmds \
@@ -42,8 +48,13 @@ LTESTS= 	connect \
                 reexec \
                 brokenkeys \
                 cfgmatch \
+                addrmatch \
+                localcommand \
                 forcecommand
 
+INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex conch-ciphers
+#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+
 USER!=          id -un
 CLEANFILES=     t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 authorized_keys_${USER} known_hosts pidfile \
@@ -52,9 +63,8 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
                 ls.copy banner.in banner.out empty.in \
                 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
-                sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv
-
-#LTESTS +=      ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+                sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
+                putty.rsa2
 
 t1:
         ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
@@ -96,3 +106,11 @@ t-exec:	${LTESTS:=.sh}
                 echo "run test $${TEST}" ... 1>&2; \
                 (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
+
+t-exec-interop: ${INTEROP_TESTS:=.sh}
+        @if [ "x$?" = "x" ]; then exit 0; fi; \
+        for TEST in ""$?; do \
+                echo "run test $${TEST}" ... 1>&2; \
+                (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+        done
+