Mercurial > hg > sonic-annotator

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pull more stuff up into include file
author Chris Cannam
date Wed, 08 Oct 2014 14:20:45 +0100
parents 2633976fbef5
children
line wrap: on
line diff
--- a/tests/test-vamp-test-plugin.sh	Wed Oct 08 13:14:39 2014 +0100
+++ b/tests/test-vamp-test-plugin.sh	Wed Oct 08 14:20:45 2014 +0100
@@ -1,21 +1,12 @@
 #!/bin/bash
 
-mypath=`dirname $0`
-r=$mypath/../sonic-annotator
+. test-include.sh
 
 infile=$mypath/audio/20sec-silence.wav
-testplug=vamp:vamp-test-plugin:vamp-test-plugin
 tmpcsv=$mypath/tmp_1_$$.csv
 
 trap "rm -f $tmpcsv" 0
 
-. test-include.sh
-
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
-
 for output in instants curve-oss curve-fsr curve-fsr-timed curve-vsr grid-oss grid-fsr notes-regions; do
     
     $r -d "$testplug:$output" -w csv --csv-one-file "$tmpcsv" --csv-force "$infile" 2>/dev/null || \