comparison SCRIPTS/process.sh @ 38:25a9332971f7

Various fixes to scripts for mingw32

 	bits=32
 	toolprefix=
 	pluginext=.so
 	hostwrapper=
 	hostext=
+	valgrind=valgrind
 	archflags=
 	;;
     linux64)
 	platform=linux
 	bits=64
 	toolprefix=
 	pluginext=.so
 	hostwrapper=
 	hostext=
+	valgrind=valgrind
 	archflags=
 	;;
     mingw32)
 	platform=mingw
 	bits=32
 	toolprefix=i686-w64-mingw32- 
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
+	valgrind=
 	archflags=
 	;;
     mingw64)
 	platform=mingw
 	bits=64
 	toolprefix=x86_64-w64-mingw32- 
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
+	valgrind=
 	archflags=
 	;;
     osx32)
 	platform=osx
 	bits=32
 	toolprefix=
 	pluginext=.dylib
 	hostwrapper=
 	hostext=
+	valgrind=
 	archflags="-arch i386"
 	;;
     osx64)
 	platform=osx
 	bits=64
 	toolprefix=
 	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"
 	;;
 esac;
 

 	echo 
 	echo "No plugins reported to test in $dir" | tee -a "$reportdir/$dir.test.txt"
 	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
-    fi
+	if [ "$good" != "yes" ]; then
+	     return 1
+	fi
+    fi
+    return 0
 }
 
 public_symbols() {
     lib="$1"
     # nm -g prints global symbols in both OS/X and GNU tools, but

 	    echo "$dir" >> "$notbuilt"
 	fi
     else
 	echo "$dir" >> "$notbuilt"
     fi
-done
-
-cat /dev/null > "$reportdir/$dir.summary.txt"
+    cat /dev/null > "$reportdir/$dir.summary.txt"
+done
 
 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
 
 echo
 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"
-done
-
-echo
+    echo "$d: Failed to build" >> "$reportdir/$d.summary.txt"
+done
+
+echo