[project @ 2005-03-02 10:00:36 by simonmar]

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

diff --git a/glafp-utils/runstdtest/runstdtest.prl b/glafp-utils/runstdtest/runstdtest.prl
index 26ba0cb..1397ac4 100644 (file)
--- a/glafp-utils/runstdtest/runstdtest.prl
+++ b/glafp-utils/runstdtest/runstdtest.prl
@@ -54,6 +54,13 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $TmpPrefix ="$DEFAULT_TMPDIR";
     $ENV{'TMPDIR'} = "$DEFAULT_TMPDIR"; # set the env var as well
 }
+# If this is Cygwin, ignore eol and CR characters.
+# Perhaps required for MSYS too, although the cygpath
+# bit is hopefully unnecessary.
+if ( `uname | grep CYGWIN` ) {
+    $CONTEXT_DIFF=$CONTEXT_DIFF . " --strip-trailing-cr" ;
+    $TmpPrefix = `cygpath -m $TmpPrefix | tr -d \\\\n`;
+}
 $ScriptFile = "$TmpPrefix/run_me$$";
 $DefaultStdoutFile = "$TmpPrefix/no_stdout$$"; # can't use /dev/null (e.g. Alphas)
 $DefaultStderrFile = "$TmpPrefix/no_stderr$$";
@@ -186,7 +193,7 @@ if ($PostScript ne '') {
 # OK, so we're gonna do the normal thing...
 
 if ($Cachegrind eq 'yes') {
-  $CachegrindPrefix = "cachegrind --logfile-fd=99 99>$CachegrindStats";
+  $CachegrindPrefix = "valgrind --skin=cachegrind --logfile-fd=99 99>$CachegrindStats";
 } else {
   $CachegrindPrefix = '';
 }
@@ -305,7 +312,7 @@ exit 0;
 sub grab_arg_arg {
     local($option, $rest_of_arg) = @_;
     
-    if ($rest_of_arg) {
+    if ($rest_of_arg ne "") {
        return($rest_of_arg);
     } elsif ($#ARGV >= 0) {
        local($temp) = $ARGV[0]; shift(@ARGV);