fix running tests with valgrind (there were a lot of bogus failures and warnings)

currently clang passes all tests under valgrind with the leak checker disabled :P (and fails most otherwise)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@55782 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/TestRunner.sh b/test/TestRunner.sh
index 455674cc0258b5b3389a260868151da45d707959..09b73d2183b79bb18b4f142cd09df3e8c819d72d 100755 (executable)
--- a/test/TestRunner.sh
+++ b/test/TestRunner.sh
@@ -46,20 +46,20 @@ if [ ! -n "$CLANG" ]; then
     CLANG="clang"
 fi
 if [ -n "$VG" ]; then
-  rm -f $OUTPUT.vg.*
-  CLANG="valgrind --leak-check=full --quiet --log-file=$OUTPUT.vg.%p $CLANG"
+  rm -f $OUTPUT.vg
+  CLANG="valgrind --leak-check=full --quiet --log-file=$OUTPUT.vg $CLANG"
 fi
 
 SCRIPT=$OUTPUT.script
 TEMPOUTPUT=$OUTPUT.tmp
 grep 'RUN:' $FILENAME | \
   sed -e "s|^.*RUN:\(.*\)$|\1|g" \
+      -e "s|clang|$CLANG|g" \
       -e "s|%s|$SUBST|g" \
       -e "s|%llvmgcc|llvm-gcc -emit-llvm|g" \
       -e "s|%llvmgxx|llvm-g++ -emit-llvm|g" \
       -e "s|%prcontext|prcontext.tcl|g" \
-      -e "s|%t|$TEMPOUTPUT|g" \
-      -e "s|clang|$CLANG|g" > $SCRIPT  
+      -e "s|%t|$TEMPOUTPUT|g" > $SCRIPT
 
 IS_XFAIL=0
 if (grep -q XFAIL $FILENAME); then
@@ -72,7 +72,8 @@ fi
 SCRIPT_STATUS=$?
 
 if [ -n "$VG" ]; then
-  VG_STATUS=`cat $OUTPUT.vg.* | wc -l`
+  [ ! -s $OUTPUT.vg ]
+  VG_STATUS=$?
 else
   VG_STATUS=0
 fi
@@ -99,7 +100,7 @@ if [ $SCRIPT_STATUS -ne 0 -o $VG_STATUS -ne 0 ]; then
   cat $OUTPUT
   if [ $VG_STATUS -ne 0 ]; then
     echo "Valgrind Output:"
-    cat $OUTPUT.vg.*
+    cat $OUTPUT.vg
   fi
   echo "******************** TEST '$TESTNAME' FAILED! ********************"
   exit 1