Changeset 2573 for zzuf/trunk/test/check-rngTweet

Timestamp:

Jul 20, 2008, 11:57:58 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Factored the test suite to avoid excessive code duplication.

File:

• zzuf/trunk/test/check-rng (modified) (4 diffs)

zzuf/trunk/test/check-rng

@@ -1 +1 @@
 #!/bin/sh
 
-set -e
+. "$(dirname "$0")/functions.inc"
 
 checkflip()
@@ -9 +9 @@
     s2=$seed
     mib=20
-    echo "*** $mib MiB of zeroes, ratio $r ***"
     rmax=-1
     rmin=-1
     rtot=0
+    new_test "$mib MiB of zeroes, ratio $r"
     for x in 0 1 2 3 4; do
         ret=`dd if=/dev/zero bs=1048576 count=$mib 2>/dev/null | "$ZZUF" -s $s2 -r $r | "$ZZERO"`
@@ -23 +23 @@
     rmean=`expr '(' $rtot + 2 ')' / 5 || true`
     delta=`expr $rmean - $expect || true`
+    printf " expected $expect min/avg/max $rmin/$rmean/$rmax .........."
     if [ "$delta" -gt -5 -a "$delta" -lt 5 ]; then
-        result="ok"
+        pass_test " ok"
     elif [ $(($rmean * 8)) -lt $(($expect * 7)) \
                -o $(($rmean * 7)) -gt $(($expect * 8)) ]; then
-        result="FAILED"
-        FAILED=$(($FAILED + 1))
+        fail_test " FAILED"
     else
-        result="ok"
+        pass_test " ok"
     fi
-    TESTED=$(($TESTED + 1))
-    echo " expected $expect min/avg/max $rmin/$rmean/$rmax .......... $result"
 }
 
-DIR="$(dirname "$0")"
-ZZUF="$DIR/../src/zzuf"
-ZZERO="$DIR/zzero"
-if [ ! -f "$ZZERO" ]; then
-  echo "error: test/zzero is missing"
-  exit 1
-fi
-FAILED=0
-TESTED=0
-
-if [ -z "$1" ]; then
-  seed=$(date | $ZZUF -m 2>/dev/null | cut -f2 -d' ' | tr -d abcdef | cut -b1-8)
-else
-  seed="$1"
-fi
-
-echo "*** running zzuf RNG test suite with seed $seed ***"
+start_test "zzuf RNG test suite"
 
 # if X flips are performed on N bits set to 0, the average number of bits
@@ -66 +48 @@
 checkflip 0.1  15205967
 
-if [ "$FAILED" != 0 ]; then
-    echo "*** $FAILED tests failed out of $TESTED ***"
-    exit 1
-fi
-echo "*** all $TESTED tests OK ***"
+stop_test
 
-exit 0
-