- (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so

[openssh.git] / regress / Makefile

diff --git a/regress/Makefile b/regress/Makefile
index 7b571f7ec1c7a281c2091fa0a78f9d9f5c46ed07..7d4e2ab4e297cb5fa2948e70ae2fd36e7ad7f507 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,13 +1,15 @@
-#      $OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm Exp $
+#      $OpenBSD: Makefile,v 1.49 2009/08/13 00:57:17 djm Exp $
 
 REGRESS_TARGETS=       t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:         $(REGRESS_TARGETS)
 
 # Interop tests are not run by default
-interop: t-exec-interop
+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 \
@@ -32,6 +34,7 @@ LTESTS=       connect \
                agent-ptrace \
                keyscan \
                keygen-change \
+               key-options \
                scp \
                sftp \
                sftp-cmds \
@@ -45,10 +48,12 @@ LTESTS=     connect \
                reexec \
                brokenkeys \
                cfgmatch \
+               addrmatch \
                localcommand \
-               forcecommand
+               forcecommand \
+               portnum
 
-INTEROP_TESTS= putty-transfer putty-ciphers putty-kex
+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
@@ -59,7 +64,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
+               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