From 6b3063e1d545e56d9c65f52a58459f5fce049128 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 19 Oct 2006 13:48:18 +0000 Subject: [PATCH] Run dos2unix on all the outputs, and don't let it eat stderr --- utils/runstdtest/runstdtest.prl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl index 419e457..4bbcef0 100644 --- a/utils/runstdtest/runstdtest.prl +++ b/utils/runstdtest/runstdtest.prl @@ -207,8 +207,12 @@ cat /dev/null > $DefaultStdoutFile cat /dev/null > $DefaultStderrFile $PreScriptLines $SpixifyLine1 -echo $TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile | dos2unix 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\' -$TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile | dos2unix 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\' +set -x +$TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1.raw 2> $TmpPrefix/runtest$$.2.raw 3> $TmpPrefix/runtest$$.3.raw\' +set +x +dos2unix < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1 +dos2unix < $TmpPrefix/runtest$$.2.raw > $TmpPrefix/runtest$$.2 +dos2unix < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3 progexit=\$? if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then echo $ToRun @PgmArgs \\< $PgmStdinFile -- 1.7.10.4