X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Frunstdtest%2Frunstdtest.prl;h=039c2534e464d1f91c17df623b33da9e3a55fe06;hb=e8043f339e23328e3457696589edaa1ab7d60a64;hp=385a9fb907a10200c83ad7650f758183def2932c;hpb=551cfdc06d22e705aee53901223522fe0d0bc8a9;p=ghc-hetmet.git

diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 385a9fb..039c253 100644
--- a/utils/runstdtest/runstdtest.prl
+++ b/utils/runstdtest/runstdtest.prl
@@ -198,9 +198,10 @@ if ($PostScript ne '') {
     local($to_do);
     $PostScriptLines = `cat $PostScript`;
     $PostScriptLines =~ s/\r//g;
-    $* = 1;
-    $PostScriptLines =~ s#\$o1#$TmpPrefix/runtest$$.1#g;
-    $PostScriptLines =~ s#\$o2#$TmpPrefix/runtest$$.2#g;
+    $PostScriptLines =~ s#\$o1#$TmpPrefix/runtest$$.1#gm;
+    $PostScriptLines =~ s#\$o2#$TmpPrefix/runtest$$.2#gm;
+# The postfix 'm' deals with recent versions of 
+# Perl that removed the $* feature
 } else {
     $PostScriptLines = '';
 }
@@ -248,7 +249,7 @@ else
     $PostScriptLines
     hit='NO'
     for out_file in @PgmStdoutFile ; do
-	if sed "s/\\r\$//" $TmpPrefix/runtest$$.1 | cmp -s \$out_file - ; then
+	if sed "s/
\$//" $TmpPrefix/runtest$$.1 | cmp -s \$out_file - ; then
 	    hit='YES'
 	fi
     done
@@ -274,7 +275,7 @@ fi
 
 hit='NO'
 for out_file in @PgmStderrFile ; do
-    if sed "s/\\r\$//" $TmpPrefix/runtest$$.2 | cmp -s \$out_file - ; then
+    if sed "s/
\$//" $TmpPrefix/runtest$$.2 | cmp -s \$out_file - ; then
 	hit='YES'
     fi
 done
@@ -526,6 +527,10 @@ sub process_stats_file {
     $MaxResidency     = 0 unless defined($MaxResidency);
     $AvgResidency     = 0 unless defined($AvgResidency);
     $ResidencySamples = 0 unless defined($ResidencySamples);
+    $Gc0Time          = 0.0 unless defined($Gc0Time);
+    $Gc0Elapsed       = 0.0 unless defined($Gc0Elapsed);
+    $Gc1Time          = 0.0 unless defined($Gc1Time);
+    $Gc1Elapsed       = 0.0 unless defined($Gc1Elapsed);
 
     # a bit of tidying
     $BytesAlloc =~ s/,//g;