X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=glafp-utils%2Frunstdtest%2Frunstdtest.prl;h=1d62fc93301b0cbb2436363b50b7a7516a4aa17e;hb=f059b94f14b9e70aa78d9e61c2a9d8db99e1ce58;hp=d32297b05620b681dd12bb0da28c7bdf8c7a3884;hpb=4764726c520c6f979f092b9b7b7f263d53dd68f9;p=ghc-hetmet.git

diff --git a/glafp-utils/runstdtest/runstdtest.prl b/glafp-utils/runstdtest/runstdtest.prl
index d32297b..1d62fc9 100644
--- a/glafp-utils/runstdtest/runstdtest.prl
+++ b/glafp-utils/runstdtest/runstdtest.prl
@@ -174,6 +174,7 @@ if ( $SysSpecificTiming =~ /^ghc/ ) {
 if ($PreScript ne '') {
     local($to_do);
     $PreScriptLines = `cat $PreScript`;
+    $PreScriptLines =~ s/\r//g;
 } else {
     $PreScriptLines = '';
 }
@@ -181,6 +182,7 @@ if ($PreScript ne '') {
 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;
@@ -240,8 +242,8 @@ fi
 if [ "$Heimdall" = "1" ]; then
   egrep '^=== HEIMDALL: ' < $TmpPrefix/runtest$$.2 > $HeimdallStats
 fi
-egrep -v '^=== HEIMDALL: ' < $TmpPrefix/runtest$$.2 > $TmpPrefix/runtest$$.2b
-mv -f $TmpPrefix/runtest$$.2b $TmpPrefix/runtest$$.2
+# egrep -v '^=== HEIMDALL: ' < $TmpPrefix/runtest$$.2 > $TmpPrefix/runtest$$.2b
+# mv -f $TmpPrefix/runtest$$.2b $TmpPrefix/runtest$$.2
 
 hit='NO'
 for out_file in @PgmStderrFile ; do