From d70fa1fd91bfab699ac28173d397d0fed893b9c0 Mon Sep 17 00:00:00 2001 From: mthomas Date: Mon, 20 Sep 2004 07:27:15 +0000 Subject: [PATCH] [project @ 2004-09-20 07:27:15 by mthomas] Make tests run on Cygwin hosted MinGW32 build. --- glafp-utils/runstdtest/runstdtest.prl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/glafp-utils/runstdtest/runstdtest.prl b/glafp-utils/runstdtest/runstdtest.prl index 5649d23..1397ac4 100644 --- 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$$"; -- 1.7.10.4