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

Pull more stuff up into include file

--- a/tests/test-csv-destinations.sh	Wed Oct 08 13:14:39 2014 +0100
+++ b/tests/test-csv-destinations.sh	Wed Oct 08 14:20:45 2014 +0100
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-mypath=`dirname $0`
-r=$mypath/../sonic-annotator
+. test-include.sh
 
 infile1=$mypath/audio/3clicks8.wav
 infile2=$mypath/audio/6clicks8.wav
@@ -15,16 +14,10 @@
 outfile3=$mypath/audio/3clicks8_vamp_vamp-example-plugins_percussiononsets_onsets.csv
 outfile4=$mypath/audio/3clicks8_vamp_vamp-example-plugins_percussiononsets_detectionfunction.csv
 
-testplug=vamp:vamp-example-plugins:percussiononsets
 tmpcsv=$mypath/tmp_1_$$.csv
 
 trap "rm -f $tmpcsv $outfile1 $outfile2 $outfile3 $outfile4 $infile1dot $outfile1dot" 0
 
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
-
 transformpfx=$mypath/transforms/transforms-rdf-writer-percussiononsets
 
 check_csv() {