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 @@ +20030914 + - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing + the regression tests from running with Solaris' make. Patch from Brian + Poole (raj at cerias.purdue.edu). + 20030913 - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for slower hosts, increase to 10 sec. @@ -1086,4 +1091,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2989 2003/09/13 12:02:05 dtucker Exp $ +$Id: ChangeLog,v 1.2990 2003/09/14 01:40:35 dtucker Exp $ diff --git a/Makefile.in b/Makefile.in index c10b1e77..8a877446 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.248 2003/09/12 20:02:16 tim Exp $ +# $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -386,7 +386,7 @@ tests: $(TARGETS) .OBJDIR="$${BUILDDIR}/regress" \ .CURDIR="`pwd`" \ BUILDDIR="$${BUILDDIR}" \ - OBJ="$${BUILDDIR}/regress" \ + OBJ="$${BUILDDIR}/regress/" \ PATH="$${BUILDDIR}:$${PATH}" \ TEST_SSH_SSH="$${TEST_SSH_SSH}" \ TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ diff --git a/regress/Makefile b/regress/Makefile index ce876d48..c0820163 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,13 +1,11 @@ # $OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $ -OBJ ?= `pwd` - 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 copy.1 copy.2 +CLEANFILES += t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 clean: - @for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done + for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done distclean: clean LTESTS= connect \ @@ -38,13 +36,13 @@ LTESTS= connect \ forwarding USER!= id -un -CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ +CLEANFILES += authorized_keys_${USER} known_hosts pidfile \ ssh_config 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 remote_pid -#LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp +#LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp t1: ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |