- (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 0536ee7b953b0a1a1f4c916122a566b34e316845..7d4e2ab4e297cb5fa2948e70ae2fd36e7ad7f507 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,10 +1,15 @@
-#      $OpenBSD: Makefile,v 1.34 2004/12/10 01:31:30 fgsch 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 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 \
@@ -40,7 +46,15 @@ LTESTS=      connect \
                forwarding \
                multiplex \
                reexec \
-               brokenkeys
+               brokenkeys \
+               cfgmatch \
+               addrmatch \
+               localcommand \
+               forcecommand \
+               portnum
+
+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 \
@@ -49,10 +63,9 @@ CLEANFILES=  t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
                rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
                ls.copy banner.in banner.out empty.in \
-               scp-ssh-wrapper.scp \
-               remote_pid
-
-#LTESTS +=     ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+               scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
+               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
@@ -92,5 +105,13 @@ t-exec:     ${LTESTS:=.sh}
        @if [ "x$?" = "x" ]; then exit 0; fi; \
        for TEST in ""$?; do \
                echo "run test $${TEST}" ... 1>&2; \
-               (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+               (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
+