summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 19:53:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 19:53:25 +1000
commitf8d5b3451726530a864b172c556c311370c244e1 (patch)
treefc00b16a85d2ab2b1eb8082bedd17bc38f9f9b90 /regress
parent6f66981ed3c6bb83b937959f329323975e356c33 (diff)
- (dtucker) [regress/stderr-after-eof.sh regress/test-exec.sh] Move the md5
helper function to the portable part of test-exec.sh.
Diffstat (limited to 'regress')
-rw-r--r--regress/stderr-after-eof.sh14
-rw-r--r--regress/test-exec.sh14
2 files changed, 15 insertions, 13 deletions
diff --git a/regress/stderr-after-eof.sh b/regress/stderr-after-eof.sh
index 9072db282..218ac6b68 100644
--- a/regress/stderr-after-eof.sh
+++ b/regress/stderr-after-eof.sh
@@ -3,23 +3,11 @@
3 3
4tid="stderr data after eof" 4tid="stderr data after eof"
5 5
6if have_prog md5sum; then
7 CHECKSUM=md5sum
8elif have_prog openssl; then
9 CHECKSUM="openssl md5"
10elif have_prog cksum; then
11 CHECKSUM=cksum
12elif have_prog sum; then
13 CHECKSUM=sum
14else
15 fatal "No checksum program available, aborting $tid test"
16fi
17
18# setup data 6# setup data
19rm -f ${DATA} ${COPY} 7rm -f ${DATA} ${COPY}
20cp /dev/null ${DATA} 8cp /dev/null ${DATA}
21for i in 1 2 3 4 5 6; do 9for i in 1 2 3 4 5 6; do
22 (date;echo $i) | $CHECKSUM >> ${DATA} 10 (date;echo $i) | md5 >> ${DATA}
23done 11done
24 12
25${SSH} -2 -F $OBJ/ssh_proxy otherhost \ 13${SSH} -2 -F $OBJ/ssh_proxy otherhost \
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 69e5042ba..d336e6193 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -207,6 +207,20 @@ config_defined ()
207 done 207 done
208 egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1 208 egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
209} 209}
210
211md5 () {
212 if have_prog md5sum; then
213 md5sum
214 elif have_prog openssl; then
215 openssl md5
216 elif have_prog cksum; then
217 cksum
218 elif have_prog sum; then
219 sum
220 else
221 wc -c
222 fi
223}
210# End of portable specific functions 224# End of portable specific functions
211 225
212# helper 226# helper