diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-08-08 17:02:12 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-08-08 17:02:12 +1000 |
| commit | acd2060f750c16d48b87b92a10b5a833227baf9d (patch) | |
| tree | 01b2d0a1b45fbf507b34eb4796d6d0af4b9d54d9 | |
| parent | 9542de4547beebf707f3640082d471f1a85534c9 (diff) | |
- (dtucker) [regress/Makefile regress/test-exec.sh] Roll back the -nt
removal. The "make clean" removes modpipe which is built by the top-level
directory before running the tests. Spotted by tim@
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/Makefile | 2 | ||||
| -rw-r--r-- | regress/test-exec.sh | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -8,6 +8,9 @@ by Kevin Brott, ok djm. - (dtucker) [misc.c] Remove define added for fallback testing that was mistakenly included in the previous commit. + - (dtucker) [regress/Makefile regress/test-exec.sh] Roll back the -nt + removal. The "make clean" removes modpipe which is built by the top-level + directory before running the tests. Spotted by tim@ 20130804 - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support diff --git a/regress/Makefile b/regress/Makefile index 3d1b669e..ab2a6ae7 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.65 2013/04/18 02:46:12 djm Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec -tests: clean $(REGRESS_TARGETS) +tests: $(REGRESS_TARGETS) # Interop tests are not run by default interop interop-tests: t-exec-interop diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 9e66f926..eee44626 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -368,7 +368,7 @@ rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER trace "generate keys" for t in rsa rsa1; do # generate user key - if [ ! -f $OBJ/$t ]; then + if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then rm -f $OBJ/$t ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ fail "ssh-keygen for $t failed" |