diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | regress/Makefile | 10 |
3 files changed, 12 insertions, 9 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20030914 | ||
2 | - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing | ||
3 | the regression tests from running with Solaris' make. Patch from Brian | ||
4 | Poole (raj at cerias.purdue.edu). | ||
5 | |||
1 | 20030913 | 6 | 20030913 |
2 | - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for | 7 | - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for |
3 | slower hosts, increase to 10 sec. | 8 | slower hosts, increase to 10 sec. |
@@ -1086,4 +1091,4 @@ | |||
1086 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1091 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1087 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1092 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1088 | 1093 | ||
1089 | $Id: ChangeLog,v 1.2989 2003/09/13 12:02:05 dtucker Exp $ | 1094 | $Id: ChangeLog,v 1.2990 2003/09/14 01:40:35 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index c10b1e779..8a8774461 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.248 2003/09/12 20:02:16 tim Exp $ | 1 | # $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -386,7 +386,7 @@ tests: $(TARGETS) | |||
386 | .OBJDIR="$${BUILDDIR}/regress" \ | 386 | .OBJDIR="$${BUILDDIR}/regress" \ |
387 | .CURDIR="`pwd`" \ | 387 | .CURDIR="`pwd`" \ |
388 | BUILDDIR="$${BUILDDIR}" \ | 388 | BUILDDIR="$${BUILDDIR}" \ |
389 | OBJ="$${BUILDDIR}/regress" \ | 389 | OBJ="$${BUILDDIR}/regress/" \ |
390 | PATH="$${BUILDDIR}:$${PATH}" \ | 390 | PATH="$${BUILDDIR}:$${PATH}" \ |
391 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | 391 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ |
392 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | 392 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ |
diff --git a/regress/Makefile b/regress/Makefile index ce876d483..c08201632 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,13 +1,11 @@ | |||
1 | # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ | 1 | # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ |
2 | 2 | ||
3 | OBJ ?= `pwd` | ||
4 | |||
5 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
6 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
7 | 5 | ||
8 | CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 | 6 | CLEANFILES += t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 |
9 | clean: | 7 | clean: |
10 | @for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done | 8 | for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done |
11 | distclean: clean | 9 | distclean: clean |
12 | 10 | ||
13 | LTESTS= connect \ | 11 | LTESTS= connect \ |
@@ -38,13 +36,13 @@ LTESTS= connect \ | |||
38 | forwarding | 36 | forwarding |
39 | 37 | ||
40 | USER!= id -un | 38 | USER!= id -un |
41 | CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ | 39 | CLEANFILES += authorized_keys_${USER} known_hosts pidfile \ |
42 | ssh_config ssh_proxy sshd_config sshd_proxy \ | 40 | ssh_config ssh_proxy sshd_config sshd_proxy \ |
43 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 41 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
44 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 42 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
45 | ls.copy remote_pid | 43 | ls.copy remote_pid |
46 | 44 | ||
47 | #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 45 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
48 | 46 | ||
49 | t1: | 47 | t1: |
50 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 48 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |