comparison tests/test-transforms-basic.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
 
 $r --skeleton $testplug > $tmpfile1 2>/dev/null || \
     fail "Fails to run with --skeleton $testplug"
 
 $r -t $tmpfile1 -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
     fail "Fails to run with -t $tmpfile -w csv --csv-stdout $infile"
 
-cmp -s $tmpfile2 $mypath/expected/transforms-basic-skeleton-1.csv || \
+csvcompare $tmpfile2 $mypath/expected/transforms-basic-skeleton-1.csv || \
     fail "Output mismatch for transforms-basic-skeleton-1.csv"
 
 for suffix in \
     -no-parameters-default-output \
     -no-parameters \

 	    fail "Internal error: no expected output file for suffix $suffix"
 
 	$r -t $transform -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
 	    fail "Fails to run transform $transform"
 
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    fail "Output mismatch for transform $transform"
     done
 done
 
 exit 0