diff tests/test-multiple-audio/test-multiple-audio.sh @ 288:fd4a6183482f kapoor_1202

Merge from branch piper-nopiper. The next release will be based on this.

--- a/tests/test-multiple-audio/test-multiple-audio.sh	Mon Nov 21 16:32:58 2016 +0000
+++ b/tests/test-multiple-audio/test-multiple-audio.sh	Fri Dec 02 10:04:44 2016 +0000
@@ -7,7 +7,7 @@
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-transform=$mypath/transforms/detectionfunction.n3 
+transform=$mypath/transforms/af.n3 
 
 urlbase=http://vamp-plugins.org/sonic-annotator/testfiles
 
@@ -24,7 +24,7 @@
 # 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 -r --summary-only $audiopath > $tmpfile1 2>/dev/null || \
+$r -t $transform -w csv --csv-digits 3 --csv-stdout -r --summary-only $audiopath > $tmpfile1 2>/dev/null || \
     fail "Fails to run transform $transform with recursive dir option"
 
 expected=$mypath/expected/all-files
@@ -37,7 +37,7 @@
 # Here we strip 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 $audiopath/playlist.m3u --summary-only 2>/dev/null > "$tmpfile2" || \
+$r -t $transform -w csv --csv-digits 3 --csv-stdout $audiopath/playlist.m3u --summary-only 2>/dev/null > "$tmpfile2" || \
     fail "Fails to run transform $transform with playlist input"
 
 cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -51,7 +51,7 @@
 
 # Strip paths again, just so we can use the same output comparison
 # file as above
-$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+$r -t $transform -w csv --csv-digits 3 --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
 cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -63,7 +63,7 @@
 
 # 4. Multiple files supplied directly on command line, with file: URL
 
-$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 file://`pwd`/$audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+$r -t $transform -w csv --csv-digits 3 --csv-stdout $audiopath/3clicks.mp3 file://`pwd`/$audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
 cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -77,7 +77,7 @@
 
     # 5. Remote playlist file referring to remote audio files
 
-    $r -t $transform -w csv --csv-stdout $urlbase/playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
+    $r -t $transform -w csv --csv-digits 3 --csv-stdout $urlbase/playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
 	fail "Fails to run transform $transform with remote playlist input"
 
     cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -89,7 +89,7 @@
 
     # 6. Local playlist file referring to mixture of remote and local audio files
 
-    $r -t $transform -w csv --csv-stdout $audiopath/remote-playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
+    $r -t $transform -w csv --csv-digits 3 --csv-stdout $audiopath/remote-playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
 	fail "Fails to run transform $transform with playlist of remote files"
 
     cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -101,7 +101,7 @@
 
     # 7. Multiple remote files supplied directly on command line
 
-    $r -t $transform -w csv --csv-stdout $urlbase/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+    $r -t $transform -w csv --csv-digits 3 --csv-stdout $urlbase/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
 	fail "Fails to run transform $transform with 2-file remote input"
 
     cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -113,7 +113,7 @@
 
     # 8. Mixture of remote and local files supplied on command line
 
-    $r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+    $r -t $transform -w csv --csv-digits 3 --csv-stdout $audiopath/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
 	fail "Fails to run transform $transform with 2-file remote input"
 
     cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
@@ -126,7 +126,7 @@
 
 # 9. As 3, but multiplexing rather than extracting separately from each file
 
-$r -t $transform --multiplex -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+$r -t $transform --multiplex --csv-digits 3 -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
 cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"