cut-and-pasto

[ghc-hetmet.git] / utils / runstdtest / runstdtest.prl

diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 7d58d93..6059760 100644 (file)
--- a/utils/runstdtest/runstdtest.prl
+++ b/utils/runstdtest/runstdtest.prl
@@ -96,7 +96,7 @@ arg: while ($_ = $ARGV[0]) {
     /^-accept-output$/        && do { $SaveStdout = 1; $SaveStderr = 1; next arg; };
 
     /^-stdout-binary/ && do { $StdoutBinary=1; next arg; };
-    /^-stdout-binary/ && do { $StderrBinary=1; next arg; };
+    /^-stderr-binary/ && do { $StderrBinary=1; next arg; };
 
     /^-O(.*)/  && do { push(@PgmArgs, &grab_arg_arg('-O',$1)); next arg; };
     /^-i(.*)/  && do { $PgmStdinFile = &grab_arg_arg('-i',$1);
@@ -223,6 +223,7 @@ cat /dev/null > $DefaultStderrFile
 $PreScriptLines
 $SpixifyLine1
 $TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1.raw 2> $TmpPrefix/runtest$$.2.raw 3> $TmpPrefix/runtest$$.3.raw\'
+progexit=\$?
 if [ "$StdoutBinary" = "0" ]; then
     dos2unix < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1
 else
@@ -234,7 +235,6 @@ else
     cp $TmpPrefix/runtest$$.2.raw $TmpPrefix/runtest$$.2
 fi
 dos2unix < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3
-progexit=\$?
 if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then
     echo $ToRun @PgmArgs \\< $PgmStdinFile
     echo "****" expected a failure, but was successful
@@ -409,7 +409,7 @@ sub process_stats_file {
 
            $GCs = $1 if /^\s*([0-9,]+) collections? in generation 0/;
 
-           if ( /^\s+([0-9]+)\s+Mb total memory/ ) {
+           if ( /^\s+([0-9]+)\s+M[Bb] total memory/ ) {
                $TotMem = $1;
            }