comparison tests/test-audioformat.sh @ 28:102bb1729184 sonic-annotator-0.4

* Test fixes for cases where the behaviour has actually been fixed for 0.4
* Emphasise this change in CHANGELOG

 tmpfile1=$mypath/tmp_1_$$
 tmpfile2=$mypath/tmp_2_$$
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
+. test-include.sh
 
 for extension in wav ogg mp3 ; do
 
     transform=$mypath/transforms/transforms-audioformat-percussiononsets.n3 
     expected=$mypath/expected/transforms-audioformat-percussiononsets-$extension.csv

 
     $r -t $transform -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
 	fail "Fails to run transform $transform against audio file $infile"
 
     if [ "$extension" = "wav" ]; then
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    fail "Output mismatch for transform $transform with audio file $infile"
     else
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    ( echo "NOTE: Output mismatch for transform $transform with audio file $infile" ; \
 	      echo "This may be the result of differences in the audio file decoder, so I am not" ; \
 	      echo "failing the test, but I recommend that you check the results." )
     fi
 done