playTests.sh: refactored round-trip tests

diff --git a/programs/playTests.sh b/programs/playTests.sh
index 08090f6bc4054ca8521ccaa2f4d946a8b9a42e4b..d29260aa8609e73a9238daac3d2ebc82aea35470 100755 (executable)
--- a/programs/playTests.sh
+++ b/programs/playTests.sh
@@ -5,7 +5,24 @@ die() {
     exit 1
 }
 
-echo "\n**** frame concatenation **** "
+roundTripTest() {
+    if [ -n "$3" ]; then
+        local c="$3"
+        local p="$2"
+    else
+        local c="$2"
+    fi
+
+    rm -f tmp1 tmp2
+    echo "roundTripTest: ./datagen $1 $p | $ZSTD -v$c | $ZSTD -d"
+    ./datagen $1 $p | md5sum > tmp1
+    ./datagen $1 $p | $ZSTD -v$c | $ZSTD -d  | md5sum > tmp2
+    diff -q tmp1 tmp2
+}
+
+[ -n "$ZSTD" ] || die "ZSTD variable must be defined!"
+
+printf "\n**** frame concatenation **** "
 
 echo "hello " > hello.tmp
 echo "world!" > world.tmp
@@ -16,7 +33,7 @@ cat hello.zstd world.zstd > helloworld.zstd
 $ZSTD -df helloworld.zstd > result.tmp
 cat result.tmp
 sdiff helloworld.tmp result.tmp
-rm *.tmp *.zstd
+rm ./*.tmp ./*.zstd
 
 echo frame concatenation test completed
 
@@ -26,37 +43,23 @@ echo foo | $ZSTD > /dev/full && die "write error not detected!"
 echo foo | $ZSTD | $ZSTD -d > /dev/full && die "write error not detected!"
 
 echo "**** zstd round-trip tests **** "
-./datagen             | md5sum > tmp1
-./datagen              | $ZSTD -v    | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen              | $ZSTD -6 -v | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g270000000 | md5sum > tmp1
-./datagen -g270000000  | $ZSTD -v    | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g270000000  | $ZSTD -v2   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g270000000  | $ZSTD -v3   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g140000000 -P60| md5sum > tmp1
-./datagen -g140000000 -P60 | $ZSTD -v4   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g140000000 -P60 | $ZSTD -v5   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g140000000 -P60 | $ZSTD -v6   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g70000000 -P70 | md5sum > tmp1
-./datagen -g70000000 -P70  | $ZSTD -v7   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g70000000 -P70  | $ZSTD -v8   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g70000000 -P70  | $ZSTD -v9   | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g35000000 -P75 | md5sum > tmp1
-./datagen -g35000000 -P75  | $ZSTD -v10  | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g35000000 -P75  | $ZSTD -v11  | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
-./datagen -g35000000 -P75  | $ZSTD -v12  | $ZSTD -d  | md5sum > tmp2
-diff tmp1 tmp2
+
+roundTripTest
+roundTripTest '' 6
+
+roundTripTest -g270000000 1
+roundTripTest -g270000000 2
+roundTripTest -g270000000 3
+
+roundTripTest -g140000000 -P60 4
+roundTripTest -g140000000 -P60 5
+roundTripTest -g140000000 -P60 6
+
+roundTripTest -g70000000 -P70 7
+roundTripTest -g70000000 -P70 8
+roundTripTest -g70000000 -P70 9
+
+roundTripTest -g35000000 -P75 10
+roundTripTest -g35000000 -P75 11
+roundTripTest -g35000000 -P75 12