diff options
-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 @@ | |||
8 | by Kevin Brott, ok djm. | 8 | by Kevin Brott, ok djm. |
9 | - (dtucker) [misc.c] Remove define added for fallback testing that was | 9 | - (dtucker) [misc.c] Remove define added for fallback testing that was |
10 | mistakenly included in the previous commit. | 10 | mistakenly included in the previous commit. |
11 | - (dtucker) [regress/Makefile regress/test-exec.sh] Roll back the -nt | ||
12 | removal. The "make clean" removes modpipe which is built by the top-level | ||
13 | directory before running the tests. Spotted by tim@ | ||
11 | 14 | ||
12 | 20130804 | 15 | 20130804 |
13 | - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support | 16 | - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support |
diff --git a/regress/Makefile b/regress/Makefile index 3d1b669e8..ab2a6ae7b 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | # $OpenBSD: Makefile,v 1.65 2013/04/18 02:46:12 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.65 2013/04/18 02:46:12 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec |
4 | tests: clean $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
5 | 5 | ||
6 | # Interop tests are not run by default | 6 | # Interop tests are not run by default |
7 | interop interop-tests: t-exec-interop | 7 | interop interop-tests: t-exec-interop |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 9e66f9269..eee446264 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -368,7 +368,7 @@ rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER | |||
368 | trace "generate keys" | 368 | trace "generate keys" |
369 | for t in rsa rsa1; do | 369 | for t in rsa rsa1; do |
370 | # generate user key | 370 | # generate user key |
371 | if [ ! -f $OBJ/$t ]; then | 371 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then |
372 | rm -f $OBJ/$t | 372 | rm -f $OBJ/$t |
373 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ | 373 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ |
374 | fail "ssh-keygen for $t failed" | 374 | fail "ssh-keygen for $t failed" |