Changeset 1589 for zzuf/trunk/test/testsuite.shTweet

Timestamp:

Jan 6, 2007, 10:25:56 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Got testsuite to work on FreeBSD.

File:

• zzuf/trunk/test/testsuite.sh (modified) (6 diffs)

zzuf/trunk/test/testsuite.sh

@@ -20 +20 @@
     ALIAS="$3"
     echo -n " $(echo "$ALIAS .............." | cut -b1-18) "
-    NEWMD5="$(eval "$ZZUF $ZZOPTS $CMD" 2>/dev/null | md5sum | cut -b1-32)"
+    NEWMD5="$(eval "$ZZUF $ZZOPTS $CMD" 2>/dev/null | $MD5PROG | cut -b1-32)"
     if [ -z "$MD5" ]; then
         MD5="$NEWMD5"
@@ -26 +26 @@
     elif [ "$NEWMD5" != "$MD5" ]; then
         OK=0
-        echo "$NEWMD5"
+        echo "$NEWMD5 FAILED"
     else
-        echo ' ...'
+        echo 'ok'
     fi
 }
@@ -37 +37 @@
         rm -f /tmp/zzuf-random-$$
         rm -f /tmp/zzuf-text-$$
-        echo "Temporary files removed."
+        echo "*** temporary files removed ***"
     else
-        echo "Files preserved:"
-        echo "  /tmp/zzuf-zero-$$"
-        echo "  /tmp/zzuf-random-$$"
-        echo "  /tmp/zzuf-text-$$"
+        echo "*** files preserved ***"
+        echo " /tmp/zzuf-zero-$$"
+        echo " /tmp/zzuf-random-$$"
+        echo " /tmp/zzuf-text-$$"
     fi
 }
 
-trap "echo ''; echo ''; echo 'Aborted.'; cleanup; exit 0" 1 2 15
+trap "echo ''; echo '*** ABORTED ***'; cleanup; exit 0" 1 2 15
 
 seed=$((0$1))
@@ -52 +52 @@
 FDCAT="$(dirname "$0")/fdcat"
 STREAMCAT="$(dirname "$0")/streamcat"
+if md5sum --help >/dev/null 2>&1; then
+  MD5PROG=md5sum
+elif md5 --help >/dev/null 2>&1; then
+  MD5PROG=md5
+else
+  echo "error: no md5 program found (tried: md5sum, md5)"
+  exit 1
+fi
+if [ ! -f "$FDCAT" -o ! -f "$STREAMCAT" ]; then
+  echo "error: test/fdcat or test/streamcat are missing"
+fi
 FAILED=0
 TESTED=0
@@ -59 +70 @@
 create
 echo "*** using seed $seed ***"
-echo ""
 
 for r in 0.000000 0.00001 0.0001 0.001 0.01 0.1 1.0 10.0; do
@@ -100 +110 @@
         fi
         TESTED=$(($TESTED + 1))
-        echo ""
     done
 done