Mercurial > hg > vamp-build-and-test

changeset 38:25a9332971f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various fixes to scripts for mingw32
author Chris Cannam
date Wed, 06 Aug 2014 17:43:06 +0100
parents 86bb97521df4
children 12d422dd6992
files .hgsubstate SCRIPTS/process.sh
diffstat 2 files changed, 21 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Aug 06 16:05:55 2014 +0100
+++ b/.hgsubstate	Wed Aug 06 17:43:06 2014 +0100
@@ -5,7 +5,7 @@
 00cffb79d0e0d84e63914c0079601145fa6997ae pyin
 df9b98c6baf8766b52a16c15ee50b11837c0a599 qm-vamp-plugins
 6b23b827b108103ae9d1f412dc6c282a21302520 segmenter-vamp-plugin
-8e94604ccff2588cfb8f3e32de21405a5440af18 silvet
+f9023a87072de7e823515cefe30a26ae9c5782e7 silvet
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins
 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
--- a/SCRIPTS/process.sh	Wed Aug 06 16:05:55 2014 +0100
+++ b/SCRIPTS/process.sh	Wed Aug 06 17:43:06 2014 +0100
@@ -50,6 +50,7 @@
 	pluginext=.so
 	hostwrapper=
 	hostext=
+	valgrind=valgrind
 	archflags=
 	;;
     linux64)
@@ -59,6 +60,7 @@
 	pluginext=.so
 	hostwrapper=
 	hostext=
+	valgrind=valgrind
 	archflags=
 	;;
     mingw32)
@@ -68,6 +70,7 @@
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
+	valgrind=
 	archflags=
 	;;
     mingw64)
@@ -77,6 +80,7 @@
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
+	valgrind=
 	archflags=
 	;;
     osx32)
@@ -86,6 +90,7 @@
 	pluginext=.dylib
 	hostwrapper=
 	hostext=
+	valgrind=
 	archflags="-arch i386"
 	;;
     osx64)
@@ -95,6 +100,7 @@
 	pluginext=.dylib
 	hostwrapper=
 	hostext=
+	valgrind=
 	# This is a difficult choice for various reasons... have to ponder
 	archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386"
 	;;
@@ -250,23 +256,28 @@
 	echo "$dir" >> "$testfailed"
 	return 1
     else
+	good=yes
 	for id in $ids; do
 	    extra=""
 	    if is_nondeterministic "$id"; then
 		extra="-n"
 	    fi
-	    echo "Running command: VAMP_PATH=\"$dir\" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext \"$extra\" \"$id\""
+	    echo "Running command: VAMP_PATH=\"$dir\" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext \"$extra\" \"$id\"" | tee -a "$reportdir/$dir.test.txt"
 	    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
-		echo "Tester failed for id $id: running again with valgrind and verbose for a report..."
+		echo "Tester failed for id $id: running again with valgrind (if available) and verbose for a report..."
 		echo "$dir" >> "$testfailed"
-		VAMP_PATH="$dir" valgrind $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext -v "$extra" "$id" 2>&1 | tee -a "$reportdir/$dir.test.txt"
-		return 1
+		VAMP_PATH="$dir" $valgrind $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext -v "$extra" "$id" 2>&1 | tee -a "$reportdir/$dir.test.txt"
+		good=no
 	    fi
 	done
+	if [ "$good" != "yes" ]; then
+	     return 1
+	fi
     fi
+    return 0
 }
 
 public_symbols() {
@@ -346,17 +357,16 @@
     else
 	echo "$dir" >> "$notbuilt"
     fi
+    cat /dev/null > "$reportdir/$dir.summary.txt"
 done
 
-cat /dev/null > "$reportdir/$dir.summary.txt"
-
 echo
 echo "** Successfully built, tested, and checked:"
 cat "$built" | while read d; do
     if ! grep -q "^$d\$" "$testfailed"; then
 	if ! grep -q "^$d\$" "$envcheckfailed"; then
 	    echo "$d"
-	    echo "Success" >> "$reportdir/$d.summary.txt"
+	    echo "$d: Success" >> "$reportdir/$d.summary.txt"
 	fi
     fi
 done | sort
@@ -365,21 +375,21 @@
 echo "** Failed tests:"
 cat "$testfailed" | sort | uniq | while read d; do
     echo "$d"
-    echo "Built successfully, but failed tests" >> "$reportdir/$d.summary.txt"
+    echo "$d: Built successfully, but failed tests" >> "$reportdir/$d.summary.txt"
 done
 
 echo
 echo "** Failed environmental checks:"
 cat "$envcheckfailed" | sort | uniq | while read d; do
     echo "$d"
-    echo "Built successfully, but failed environmental checks" >> "$reportdir/$d.summary.txt"
+    echo "$d: Built successfully, but failed environmental checks" >> "$reportdir/$d.summary.txt"
 done
 
 echo
 echo "** Failed to build:"	    
 cat "$notbuilt" | sort | while read d; do
     echo "$d"
-    echo "Failed to build" >> "$reportdir/$d.summary.txt"
+    echo "$d: Failed to build" >> "$reportdir/$d.summary.txt"
 done
 
 echo