Import of OpenSSH 4.9p1

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

diff --git a/openssh/regress/Makefile b/openssh/regress/Makefile
index 26224cd7d8e62bdf56bb5de2602c464ea6720290..b229fca4832731314c8f07782969154ec43fc32a 100644 (file)
--- a/openssh/regress/Makefile
+++ b/openssh/regress/Makefile
@@ -1,8 +1,16 @@
-#      $OpenBSD: Makefile,v 1.13 2002/04/01 22:15:08 markus Exp $
+#      $OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm Exp $
 
-REGRESSTARGETS=        t1 t2 t3 t4 t5 t6 t7
+REGRESS_TARGETS=       t1 t2 t3 t4 t5 t6 t7 t-exec
+tests:         $(REGRESS_TARGETS)
 
-CLEANFILES+=   t2.out t6.out1 t6.out2 t7.out t7.out.pub 
+# 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 \
                proxy-connect \
@@ -10,38 +18,64 @@ LTESTS=     connect \
                proto-version \
                proto-mismatch \
                exit-status \
+               envpass \
                transfer \
+               banner \
+               rekey \
                stderr-data \
                stderr-after-eof \
                broken-pipe \
                try-ciphers \
                yes-head \
+               login-timeout \
                agent \
+               agent-getpeereid \
+               agent-timeout \
+               agent-ptrace \
                keyscan \
+               keygen-change \
+               scp \
                sftp \
-               forwarding
+               sftp-cmds \
+               sftp-badcmds \
+               sftp-batch \
+               sftp-glob \
+               reconfigure \
+               dynamic-forward \
+               forwarding \
+               multiplex \
+               reexec \
+               brokenkeys \
+               cfgmatch \
+               localcommand \
+               forcecommand
+
+INTEROP_TESTS= putty-transfer putty-ciphers putty-kex
+#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
 USER!=         id -un
-CLEANFILES+=   authorized_keys_${USER} known_hosts pidfile \
-               ssh_config ssh_proxy sshd_config sshd_proxy \
+CLEANFILES=    t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+               authorized_keys_${USER} known_hosts pidfile \
+               ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
                rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
                rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
-               ls.copy
-
-#LTESTS+=      ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+               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 \
+               putty.rsa2
 
 t1:
        ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
 t2:
-       cat ${.CURDIR}/rsa_openssh.prv > t2.out
-       chmod 600 t2.out
-       ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
+       cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
+       chmod 600 $(OBJ)/t2.out
+       ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
-       ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\
-               ssh-keygen -if /dev/stdin |\
-               diff - ${.CURDIR}/rsa_openssh.pub
+       ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
+       ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
+       rm -f ${.CURDIR}/rsa_secsh.pub
 
 t4:
        ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
@@ -52,22 +86,29 @@ t5:
                awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
 
 t6:
-       ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > t6.out1
-       ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > t6.out2
-       chmod 600 t6.out1
-       ssh-keygen -yf t6.out1 | diff - t6.out2
+       ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
+       ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
+       chmod 600 $(OBJ)/t6.out1
+       ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
 
-t7.out:
+$(OBJ)/t7.out:
        ssh-keygen -q -t rsa -N '' -f $@
 
-t7: t7.out
-       ssh-keygen -lf t7.out > /dev/null
-       ssh-keygen -Bf t7.out > /dev/null
+t7: $(OBJ)/t7.out
+       ssh-keygen -lf $(OBJ)/t7.out > /dev/null
+       ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
+
+t-exec:        ${LTESTS:=.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
 
-.for t in ${LTESTS}
-REGRESSTARGETS+=t-${t}
-t-${t}:
-       sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh
-.endfor
+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
 
-.include "bsd.regress.mk"