comparison tests/test-multiple-audio.sh @ 111:74f7ad72fee6

Simplify playlist handling (hoist it up a level)

 . test-include.sh
 
 transform=$mypath/transforms/transforms-summaries-percussiononsets-detectionfunction.n3 
 
 # Note, the output here depends on all the audio files present -- we
-# would have to regenerate it if we added more test audio files
+# would have to regenerate it if we added more test audio files. Note
+# that the -r flag is not supposed to pick up playlist files, only
+# audio files
 $r -t $transform -w csv --csv-stdout $mypath -r --summary-only > $tmpfile 2>/dev/null || \
     fail "Fails to run transform $transform with recursive dir option"
 
 expected=$mypath/expected/transforms-summaries-percussiononsets-all-files
 csvcompare $tmpfile $expected.csv || \
-    fail "Output mismatch for transform $transform with summaries and recursive dir option"
+    faildiff "Output mismatch for transform $transform with summaries and recursive dir option" $tmpfile $expected.csv
 
 # Here we remove any leading path from the audio file in the output,
 # because the playlist reader will have resolved files to absolute
 # paths and those will differ between systems
 $r -t $transform -w csv --csv-stdout $mypath/audio/playlist.m3u --summary-only 2>/dev/null | sed 's,^"\.*/[^"]*/,",' > $tmpfile || \
     fail "Fails to run transform $transform with playlist input"
 
 expected=$mypath/expected/transforms-summaries-percussiononsets-playlist
 csvcompare $tmpfile $expected.csv || \
-    fail "Output mismatch for transform $transform with summaries and playlist input"
+    faildiff "Output mismatch for transform $transform with summaries and playlist input" $tmpfile $expected.csv
 
 # Same here, just so we can use the same output comparison file as above
 $r -t $transform -w csv --csv-stdout $mypath/audio/3clicks8.wav $mypath/audio/6clicks8.wav --summary-only 2>/dev/null | sed 's,^"\.*/[^"]*/,",' > $tmpfile || \
     fail "Fails to run transform $transform with 2-file input"
 
 expected=$mypath/expected/transforms-summaries-percussiononsets-playlist
 csvcompare $tmpfile $expected.csv || \
-    fail "Output mismatch for transform $transform with summaries and 2-file input"
+    faildiff "Output mismatch for transform $transform with summaries and 2-file input" $tmpfile $expected.csv