diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 31 |
2 files changed, 36 insertions, 2 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20030904 | ||
2 | - (dtucker) Portablize regression tests. Parts contributed by Roumen | ||
3 | Petrov, David M. Williams and Corinna Vinschen. | ||
4 | - [Makefile.in] Add "make tests" target and "make clean" hooks. | ||
5 | |||
1 | 20030903 | 6 | 20030903 |
2 | - (djm) OpenBSD CVS Sync | 7 | - (djm) OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2003/08/26 09:58:43 | 8 | - markus@cvs.openbsd.org 2003/08/26 09:58:43 |
@@ -987,4 +992,4 @@ | |||
987 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 992 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
988 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 993 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
989 | 994 | ||
990 | $Id: ChangeLog,v 1.2941 2003/09/03 02:13:30 djm Exp $ | 995 | $Id: ChangeLog,v 1.2942 2003/09/04 03:41:06 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 0ae7e4454..dfc510fae 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.242 2003/08/26 02:22:04 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.243 2003/09/04 03:41:06 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@ |
@@ -195,6 +195,7 @@ clean: | |||
195 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 195 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
196 | rm -f *.out core | 196 | rm -f *.out core |
197 | (cd openbsd-compat && $(MAKE) clean) | 197 | (cd openbsd-compat && $(MAKE) clean) |
198 | (cd $(srcdir)/regress && $(MAKE) $@) | ||
198 | 199 | ||
199 | distclean: | 200 | distclean: |
200 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 201 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
@@ -366,3 +367,31 @@ uninstall: | |||
366 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 367 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
367 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 368 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
368 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 369 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
370 | |||
371 | tests: $(TARGETS) | ||
372 | BUILDDIR=`pwd`; \ | ||
373 | mkdir -p `pwd`/regress; \ | ||
374 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | ||
375 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | ||
376 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | ||
377 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | ||
378 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | ||
379 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | ||
380 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | ||
381 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
382 | cd $(srcdir)/regress || exit $$?; \ | ||
383 | $(MAKE) \ | ||
384 | .OBJDIR="$${BUILDDIR}/regress" \ | ||
385 | .CURDIR="`pwd`" \ | ||
386 | OBJ="$${BUILDDIR}/regress" \ | ||
387 | PATH="$${BUILDDIR}:$${PATH}" \ | ||
388 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | ||
389 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | ||
390 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ | ||
391 | TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ | ||
392 | TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ | ||
393 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | ||
394 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | ||
395 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | ||
396 | EXEEXT="$${EXEEXT}" \ | ||
397 | $@ | ||