changeset 34:432b33b0bfa6

Merge

--- a/SCRIPTS/process.sh	Wed Aug 06 16:02:26 2014 +0100
+++ b/SCRIPTS/process.sh	Wed Aug 06 16:04:36 2014 +0100
@@ -202,10 +202,14 @@
     if configure_maybe "$dir"; then
 	mfile=$(find_makefile "$dir")
 	if [ -n "$mfile" ]; then
-	    make -C "$dir" -f "$mfile" clean
-	    build "$dir"
+	    if make -C "$dir" -f "$mfile" clean; then
+		build "$dir"
+	    else
+		echo "Failed to 'make clean' in $dir!" | tee "$reportdir/$dir.build.txt"
+		return 1
+	    fi
 	else
-	    echo "Failed to find a Makefile in $dir"
+	    echo "Failed to find a Makefile in $dir!" | tee "$reportdir/$dir.build.txt"
 	    return 1
 	fi
     fi
@@ -239,9 +243,10 @@
     ##!!! todo: timeout if the plugin takes too long and report as failure?
     dir="$1"
     ids=$(VAMP_PATH="$dir" $hostwrapper vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids | sed 's/^vamp://' | sed 's/\r//g' )
+    cat /dev/null > "$reportdir/$dir.test.txt"
     if [ -z "$ids" ]; then
 	echo 
-	echo "No plugins reported to test in $dir"
+	echo "No plugins reported to test in $dir" | tee -a "$reportdir/$dir.test.txt"
 	echo "$dir" >> "$testfailed"
 	return 1
     else
@@ -251,7 +256,7 @@
 		extra="-n"
 	    fi
 	    echo "Running command: VAMP_PATH=\"$dir\" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext \"$extra\" \"$id\""
-	    if ( VAMP_PATH="$dir" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext "$extra" "$id" 2>&1 | tee "$reportdir/$dir.test.txt" ; exit ${PIPESTATUS[0]} ) ; then
+	    if ( VAMP_PATH="$dir" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext "$extra" "$id" 2>&1 | tee -a "$reportdir/$dir.test.txt" ; exit ${PIPESTATUS[0]} ) ; then
 		echo "OK"
 	    else
 		echo
@@ -277,9 +282,10 @@
 run_environmental_tests() {
     dir="$1"
     good=yes
+    cat /dev/null > "$reportdir/$dir.envtest.txt"
     for lib in $dir/*$pluginext; do 
 	if [ ! -f "$lib" ]; then
-	    echo "NOTE: no library found in $dir?"
+	    echo "NOTE: no library found in $dir?" | tee -a "$reportdir/$dir.envtest.txt"
 	    good=no
 	else
 	    echo 
@@ -288,13 +294,13 @@
 		others=`public_symbols "$lib" | grep -v vampGetPluginDescriptor`
 		if [ -n "$others" ]; then
 		    count=`echo "$others" | wc -l`
-		    echo "WARNING: $count extra symbols exported by plugin library"
+		    echo "WARNING: $count extra symbols exported by plugin library" | tee -a "$reportdir/$dir.envtest.txt"
 		    good=no
 		else
-		    echo "GOOD: library $lib only exports vampGetPluginDescriptor"
+		    echo "GOOD: library $lib only exports vampGetPluginDescriptor" | tee -a "$reportdir/$dir.envtest.txt"
 		fi
 	    else
-		echo "NOTE: found library $lib that is not a Vamp plugin library"
+		echo "NOTE: found library $lib that is not a Vamp plugin library" | tee -a "$reportdir/$dir.envtest.txt"
 	    fi
 	fi
     done
@@ -348,8 +354,10 @@
 echo "** Successfully built, tested, and checked:"
 cat "$built" | while read d; do
     if ! grep -q "^$d\$" "$testfailed"; then
-	echo "$d"
-	echo "Success" >> "$reportdir/$d.summary.txt"
+	if ! grep -q "^$d\$" "$envcheckfailed"; then
+	    echo "$d"
+	    echo "Success" >> "$reportdir/$d.summary.txt"
+	fi
     fi
 done | sort