diff test/regression/regression.sh @ 149:b83e6fbe22cc memory

Update regression tests

--- a/test/regression/regression.sh	Wed May 17 15:55:29 2017 +0100
+++ b/test/regression/regression.sh	Wed May 17 15:55:37 2017 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -u
 
 testdir=$(dirname "$0")
 rootdir="$testdir/../.."
@@ -13,22 +13,33 @@
 echo "Running regression test..."
 
 for output in smoothedpitchtrack notes ; do
+    for fixedlag in off on ; do
 
-    ( time ( VAMP_PATH="$rootdir" sonic-annotator \
-	              -d vamp:pyin:pyin:$output \
-	              -w csv --csv-stdout --csv-omit-filename \
-	              "$rootdir/testdata/bob_02.wav" \
-	              > "$testdir/obtained-$output.csv" \
-	              2> "$testdir/log-$output.txt" ) ) 2>&1 | \
-        grep -i real | \
-        sed 's/^real/Elapsed time/'
+        flsuffix=""
+        if [ "$fixedlag" = "on" ]; then
+            flsuffix="-fixedlag"
+        fi
 
-    if ! cmp -s "$testdir/expected-$output.csv" "$testdir/obtained-$output.csv" ; then
-        echo "*** FAILED for output $output, diff follows:"
-        sdiff -w78 "$testdir/expected-$output.csv" "$testdir/obtained-$output.csv"
-    else
-        echo "Succeeded for output $output"
-    fi
+        echo
+        echo "Testing output $output with fixed-lag $fixedlag..."
+    
+        ( time ( VAMP_PATH="$rootdir" sonic-annotator \
+	                  -t "$testdir/transform-$output$flsuffix.ttl" \
+	                  -w csv --csv-stdout --csv-omit-filename \
+	                  "$rootdir/testdata/bob_02.wav" \
+	                  > "$testdir/obtained-$output$flsuffix.csv" \
+	                  2> "$testdir/log-$output$flsuffix.txt" ) ) 2>&1 | \
+            grep -i real | \
+            sed 's/^real/Elapsed time/'
+
+        if ! cmp -s "$testdir/expected-$output$flsuffix.csv" "$testdir/obtained-$output$flsuffix.csv" ; then
+            echo "*** FAILED for output $output with fixed-lag $fixedlag, diff follows:"
+            echo "    (expected on left, obtained on right)"
+            sdiff -w78 "$testdir/expected-$output$flsuffix.csv" "$testdir/obtained-$output$flsuffix.csv"
+        else
+            echo "Succeeded for output $output with fixed-lag $fixedlag"
+        fi
+    done
 done