diff tests/test-audioformat.sh @ 118:0fe5abb56a6e test-reorg

Pull more stuff up into include file
author Chris Cannam
date Wed, 08 Oct 2014 14:20:45 +0100
parents 94d988cef54e
children
line wrap: on
line diff
--- a/tests/test-audioformat.sh	Wed Oct 08 13:14:39 2014 +0100
+++ b/tests/test-audioformat.sh	Wed Oct 08 14:20:45 2014 +0100
@@ -1,17 +1,13 @@
 #!/bin/bash
 
-mypath=`dirname $0`
-r=$mypath/../sonic-annotator
+. test-include.sh
 
 inbase=$mypath/audio/3clicks
-testplug=vamp:vamp-example-plugins:percussiononsets
 tmpfile1=$mypath/tmp_1_$$
 tmpfile2=$mypath/tmp_2_$$
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-. test-include.sh
-
 for extension in wav ogg mp3 ; do
 
     transform=$mypath/transforms/transforms-audioformat-percussiononsets.n3 
@@ -34,7 +30,7 @@
 
     if [ "$extension" = "wav" ]; then
 	csvcompare $tmpfile2 $expected || \
-	    fail "Output mismatch for transform $transform with audio file $infile"
+	    faildiff "Output mismatch for transform $transform with audio file $infile" $tmpfile2 $expected
     else
 	csvcompare $tmpfile2 $expected || \
 	    ( echo "NOTE: Output mismatch for transform $transform with audio file $infile" ; \