diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-08-08 10:58:49 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-08-08 10:58:49 +1000 |
commit | a5a3cbfa0fb8ef011d3e7b38910a13f6ebbb8818 (patch) | |
tree | 650c4de56131c7b41528a97bb4319f7be2f0d51c | |
parent | f3ab2c5f9cf4aed44971eded3ac9eeb1344b2be5 (diff) |
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
since some platforms (eg really old FreeBSD) don't have it. Instead,
run "make clean" before a complete regress run. ok djm.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/Makefile | 2 | ||||
-rw-r--r-- | regress/test-exec.sh | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20130808 | ||
2 | - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt | ||
3 | since some platforms (eg really old FreeBSD) don't have it. Instead, | ||
4 | run "make clean" before a complete regress run. ok djm. | ||
5 | |||
1 | 20130804 | 6 | 20130804 |
2 | - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support | 7 | - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support |
3 | for building with older Heimdal versions. ok djm. | 8 | for building with older Heimdal versions. ok djm. |
diff --git a/regress/Makefile b/regress/Makefile index ab2a6ae7b..3d1b669e8 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: $(REGRESS_TARGETS) | 4 | tests: clean $(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 eee446264..9e66f9269 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 ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then | 371 | if [ ! -f $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" |