- (dtucker) Portablize regression tests. Parts contributed by Roumen
Petrov, David M. Williams and Corinna Vinschen.
- [Makefile.in] Add "make tests" target and "make clean" hooks.
diff --git a/ChangeLog b/ChangeLog
index de35ce7..6a64abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20030904
+ - (dtucker) Portablize regression tests. Parts contributed by Roumen
+ Petrov, David M. Williams and Corinna Vinschen.
+ - [Makefile.in] Add "make tests" target and "make clean" hooks.
+
20030903
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/08/26 09:58:43
@@ -987,4 +992,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.2941 2003/09/03 02:13:30 djm Exp $
+$Id: ChangeLog,v 1.2942 2003/09/04 03:41:06 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index 0ae7e44..dfc510f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.242 2003/08/26 02:22:04 dtucker Exp $
+# $Id: Makefile.in,v 1.243 2003/09/04 03:41:06 dtucker Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -195,6 +195,7 @@
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
(cd openbsd-compat && $(MAKE) clean)
+ (cd $(srcdir)/regress && $(MAKE) $@)
distclean:
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
@@ -366,3 +367,31 @@
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+
+tests: $(TARGETS)
+ BUILDDIR=`pwd`; \
+ mkdir -p `pwd`/regress; \
+ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
+ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
+ TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
+ TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \
+ TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \
+ TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
+ TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
+ TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
+ cd $(srcdir)/regress || exit $$?; \
+ $(MAKE) \
+ .OBJDIR="$${BUILDDIR}/regress" \
+ .CURDIR="`pwd`" \
+ OBJ="$${BUILDDIR}/regress" \
+ PATH="$${BUILDDIR}:$${PATH}" \
+ TEST_SSH_SSH="$${TEST_SSH_SSH}" \
+ TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
+ TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
+ TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \
+ TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
+ TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
+ TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
+ TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
+ EXEEXT="$${EXEEXT}" \
+ $@