summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/stderr-after-eof.sh14
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 64f55c335..19632cb2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
10 - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have 10 - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have
11 it). The sparse file will take less disk space too. 11 it). The sparse file will take less disk space too.
12 - [regress/sftp-cmds.sh] Ensure file used for test are readable. 12 - [regress/sftp-cmds.sh] Ensure file used for test are readable.
13 - [regress/stderr-after-eof.sh] Search for a usable checksum program.
13 14
1420030903 1520030903
15 - (djm) OpenBSD CVS Sync 16 - (djm) OpenBSD CVS Sync
@@ -1000,4 +1001,4 @@
1000 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1001 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1001 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1002 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1002 1003
1003$Id: ChangeLog,v 1.2947 2003/09/04 04:26:31 dtucker Exp $ 1004$Id: ChangeLog,v 1.2948 2003/09/04 04:32:02 dtucker Exp $
diff --git a/regress/stderr-after-eof.sh b/regress/stderr-after-eof.sh
index bebd700bf..ae9cf8d98 100644
--- a/regress/stderr-after-eof.sh
+++ b/regress/stderr-after-eof.sh
@@ -7,13 +7,23 @@ DATA=/etc/motd
7DATA=${OBJ}/data 7DATA=${OBJ}/data
8COPY=${OBJ}/copy 8COPY=${OBJ}/copy
9 9
10MD5=md5sum 10if [ -x "`which md5sum 2>&1`" ]; then
11 CHECKSUM=md5sum
12elif [ -x "`which openssl 2>&1`" ]; then
13 CHECKSUM="openssl md5"
14elif [ -x "`which cksum 2>&1`" ]; then
15 CHECKSUM=cksum
16elif [ -x "`which sum 2>&1`" ]; then
17 CHECKSUM=sum
18else
19 fatal "No checksum program available, aborting $tid test"
20fi
11 21
12# setup data 22# setup data
13rm -f ${DATA} ${COPY} 23rm -f ${DATA} ${COPY}
14cp /dev/null ${DATA} 24cp /dev/null ${DATA}
15for i in 1 2 3 4 5 6; do 25for i in 1 2 3 4 5 6; do
16 (date;echo $i) | $MD5 >> ${DATA} 26 (date;echo $i) | $CHECKSUM >> ${DATA}
17done 27done
18 28
19${SSH} -2 -F $OBJ/ssh_proxy otherhost \ 29${SSH} -2 -F $OBJ/ssh_proxy otherhost \