diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /regress/Makefile | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'regress/Makefile')
-rw-r--r-- | regress/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/regress/Makefile b/regress/Makefile index 9e98e5880..4f47bc3fd 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.31 2004/06/24 19:32:00 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.36 2005/03/04 08:48:46 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -34,20 +34,22 @@ LTESTS= connect \ | |||
34 | sftp-cmds \ | 34 | sftp-cmds \ |
35 | sftp-badcmds \ | 35 | sftp-badcmds \ |
36 | sftp-batch \ | 36 | sftp-batch \ |
37 | sftp-glob \ | ||
37 | reconfigure \ | 38 | reconfigure \ |
38 | dynamic-forward \ | 39 | dynamic-forward \ |
39 | forwarding \ | 40 | forwarding \ |
40 | multiplex \ | 41 | multiplex \ |
41 | reexec | 42 | reexec \ |
43 | brokenkeys | ||
42 | 44 | ||
43 | USER!= id -un | 45 | USER!= id -un |
44 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | 46 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ |
45 | authorized_keys_${USER} known_hosts pidfile \ | 47 | authorized_keys_${USER} known_hosts pidfile \ |
46 | ssh_config ssh_proxy sshd_config sshd_proxy \ | 48 | ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ |
47 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 49 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
48 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 50 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
49 | ls.copy banner.in banner.out empty.in \ | 51 | ls.copy banner.in banner.out empty.in \ |
50 | scp-ssh-wrapper.exe \ | 52 | scp-ssh-wrapper.scp ssh_proxy_envpass \ |
51 | remote_pid | 53 | remote_pid |
52 | 54 | ||
53 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 55 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
@@ -90,5 +92,5 @@ t-exec: ${LTESTS:=.sh} | |||
90 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 92 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
91 | for TEST in ""$?; do \ | 93 | for TEST in ""$?; do \ |
92 | echo "run test $${TEST}" ... 1>&2; \ | 94 | echo "run test $${TEST}" ... 1>&2; \ |
93 | (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 95 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
94 | done | 96 | done |