Mercurial > hg > sonic-annotator
diff tests/test-multiple-audio.sh @ 112:0c2d8c945bbf multiplex
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Thu, 02 Oct 2014 15:23:25 +0100 |
| parents | 74f7ad72fee6 |
| children | 5be4995f4029 |
line wrap: on
line diff
--- a/tests/test-multiple-audio.sh Thu Oct 02 14:54:48 2014 +0100 +++ b/tests/test-multiple-audio.sh Thu Oct 02 15:23:25 2014 +0100 @@ -12,13 +12,15 @@ 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 @@ -28,7 +30,7 @@ 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 || \ @@ -36,7 +38,7 @@ 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