Import of OpenSSH 5.1p1

[gssapi-openssh.git] / openssh / regress / Makefile

diff --git a/openssh/regress/Makefile b/openssh/regress/Makefile
index b229fca4832731314c8f07782969154ec43fc32a..3b8ea245bbec7914849ab7b1c03e314302824036 100644 (file)
--- a/openssh/regress/Makefile
+++ b/openssh/regress/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm 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)
@@ -34,6 +34,7 @@ LTESTS=       connect \
                agent-ptrace \
                keyscan \
                keygen-change \
+               key-options \
                scp \
                sftp \
                sftp-cmds \
@@ -47,10 +48,11 @@ LTESTS=     connect \
                reexec \
                brokenkeys \
                cfgmatch \
+               addrmatch \
                localcommand \
                forcecommand
 
-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