X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Frunstdtest%2Frunstdtest.prl;h=0a9bd9858913a3d607da15e7e3a858255001e7ef;hb=326d5e5a5f9a52ea38917041d7b5f00cc8e21191;hp=4bbcef0077213fce8bd6f4d71848933c9d362641;hpb=6b3063e1d545e56d9c65f52a58459f5fce049128;p=ghc-hetmet.git

diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 4bbcef0..0a9bd98 100644
--- a/utils/runstdtest/runstdtest.prl
+++ b/utils/runstdtest/runstdtest.prl
@@ -207,9 +207,7 @@ cat /dev/null > $DefaultStdoutFile
 cat /dev/null > $DefaultStderrFile
 $PreScriptLines
 $SpixifyLine1
-set -x
 $TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1.raw 2> $TmpPrefix/runtest$$.2.raw 3> $TmpPrefix/runtest$$.3.raw\'
-set +x
 dos2unix < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1
 dos2unix < $TmpPrefix/runtest$$.2.raw > $TmpPrefix/runtest$$.2
 dos2unix < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3
@@ -276,7 +274,7 @@ if [ $SaveStderr = 1 ] &&
 	cp $TmpPrefix/runtest$$.2 $PgmStderrFile[0]
 fi
 
-${RM} core $ToRunOrig.spix $DefaultStdoutFile $DefaultStderrFile $TmpPrefix/runtest$$.1 $TmpPrefix/runtest$$.2 $TmpPrefix/runtest$$.3
+${RM} core $ToRunOrig.spix $DefaultStdoutFile $DefaultStderrFile $TmpPrefix/runtest$$.1 $TmpPrefix/runtest$$.2 $TmpPrefix/runtest$$.3 $TmpPrefix/runtest$$.1.raw $TmpPrefix/runtest$$.2.raw $TmpPrefix/runtest$$.3.raw
 exit \$myexit
 EOSCRIPT
 
@@ -371,7 +369,12 @@ sub process_stats_file {
 	    }
 
 	    $BytesAlloc = $1 if /^\s*([0-9,]+) bytes allocated in the heap/;
-	    $GCWork += $1    if /^\s*([0-9,]+) bytes copied during GC/;
+	    
+	    if (/^\s*([0-9,]+) bytes copied during GC/) {
+	       $tmp = $1;
+	       $tmp =~ s/,//g;
+	       $GCWork += $tmp;
+            }
 
 #	    if ( /^\s*([0-9,]+) bytes maximum residency .* (\d+) sample/ ) {
 #		$MaxResidency = $1; $ResidencySamples = $2;
@@ -441,7 +444,6 @@ sub process_stats_file {
 
     # a bit of tidying
     $BytesAlloc =~ s/,//g;
-    $GCWork =~ s/,//g;
     $MaxResidency =~ s/,//g;
     $GCs =~ s/,//g;
     $InitTime =~ s/,//g;