diff 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
author Chris Cannam
date Fri, 25 Sep 2009 12:00:58 +0000
parents 03a02c1f0a9f
children 94d988cef54e
line wrap: on
line diff
--- a/tests/test-audioformat.sh	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/test-audioformat.sh	Fri Sep 25 12:00:58 2009 +0000
@@ -10,10 +10,7 @@
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
+. test-include.sh
 
 for extension in wav ogg mp3 ; do
 
@@ -36,10 +33,10 @@
 	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." )