- dtucker@cvs.openbsd.org 2013/11/09 05:41:34
[regress/test-exec.sh regress/rekey.sh]
Use smaller test data files to speed up tests. Grow test datafiles
where necessary for a specific test.
diff --git a/ChangeLog b/ChangeLog
index 7372ad2..a636019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20131109
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2013/11/09 05:41:34
+ [regress/test-exec.sh regress/rekey.sh]
+ Use smaller test data files to speed up tests. Grow test datafiles
+ where necessary for a specific test.
+
20131108
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2013/11/08 01:06:14
@@ -32,6 +39,11 @@
- (dtucker) [contrib/cygwin/ssh-host-config] Simplify host key generation:
rather than testing and generating each key, call ssh-keygen -A.
Patch from vinschen at redhat.com.
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2013/11/09 05:41:34
+ [regress/test-exec.sh regress/rekey.sh]
+ Use smaller test data files to speed up tests. Grow test datafiles
+ where necessary for a specific test.
20131107
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
diff --git a/regress/rekey.sh b/regress/rekey.sh
index 6095da8..fe81f0c 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: rekey.sh,v 1.12 2013/11/08 01:06:14 dtucker Exp $
+# $OpenBSD: rekey.sh,v 1.13 2013/11/09 05:41:34 dtucker Exp $
# Placed in the Public Domain.
tid="rekey"
@@ -26,6 +26,8 @@
fi
}
+increase_datafile_size 300
+
opts=""
for i in `${SSH} -Q kex`; do
opts="$opts KexAlgorithms=$i"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index eee4462..aac8aa5 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.46 2013/06/21 02:26:26 djm Exp $
+# $OpenBSD: test-exec.sh,v 1.47 2013/11/09 05:41:34 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -133,7 +133,12 @@
# Path to sshd must be absolute for rexec
case "$SSHD" in
/*) ;;
-*) SSHD=`which sshd` ;;
+*) SSHD=`which $SSHD` ;;
+esac
+
+case "$SSHAGENT" in
+/*) ;;
+*) SSHAGENT=`which $SSHAGENT` ;;
esac
# Logfiles.
@@ -166,14 +171,22 @@
# Some test data. We make a copy because some tests will overwrite it.
# The tests may assume that $DATA exists and is writable and $COPY does
-# not exist.
+# not exist. Tests requiring larger data files can call increase_datafile_size
+# [kbytes] to ensure the file is at least that large.
DATANAME=data
DATA=$OBJ/${DATANAME}
-cat $SSHD $SSHD $SSHD $SSHD >${DATA}
+cat ${SSHAGENT} >${DATA}
chmod u+w ${DATA}
COPY=$OBJ/copy
rm -f ${COPY}
+increase_datafile_size()
+{
+ while [ `du -k ${DATA} | cut -f1` -lt $1 ]; do
+ cat ${SSHAGENT} >>${DATA}
+ done
+}
+
# these should be used in tests
export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP