summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2013-08-08 00:58:49 +0000
committerdtucker <dtucker>2013-08-08 00:58:49 +0000
commitc5837d60ef23920bd831f3ae125d79e2a654b252 (patch)
tree43fa5fbac7ede10cb6246ba9ba74ee3a77331b8d
parent54706ec3e7ad81821476b9fac6333f18ef48b344 (diff)
downloadopenssh-c5837d60ef23920bd831f3ae125d79e2a654b252.tar.gz
- (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--ChangeLog5
-rw-r--r--regress/Makefile2
-rw-r--r--regress/test-exec.sh2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 997c5b54..3ca13ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20130808
+ - (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.
+
20130804
- (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support
for building with older Heimdal versions. ok djm.
diff --git a/regress/Makefile b/regress/Makefile
index ab2a6ae7..3d1b669e 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: $(REGRESS_TARGETS)
+tests: clean $(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 eee44626..9e66f926 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 ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then
+ if [ ! -f $OBJ/$t ]; then
rm -f $OBJ/$t
${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\
fail "ssh-keygen for $t failed"