X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Frunstdtest%2Frunstdtest.prl;h=419e457c100db9d10dbe76a220e325a960991dc0;hb=0b86bc9b022a5965d2b35f143ff4b919f784e676;hp=da081736dd4945364a7b0405a3d6c6c43be9528d;hpb=9491f55ce4ab4ea288674c6a0cc174bb8673c7a1;p=ghc-hetmet.git diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl index da08173..419e457 100644 --- a/utils/runstdtest/runstdtest.prl +++ b/utils/runstdtest/runstdtest.prl @@ -68,7 +68,7 @@ $DefaultStderrFile = "$TmpPrefix/no_stderr$$"; @PgmStderrFile = (); $PreScript = ''; $PostScript = ''; -$TimeCmd = ''; +$TimeCmd = 'time'; $StatsFile = "$TmpPrefix/stats$$"; $CachegrindStats = "cachegrind.out.summary"; $SysSpecificTiming = ''; @@ -207,8 +207,8 @@ cat /dev/null > $DefaultStdoutFile cat /dev/null > $DefaultStderrFile $PreScriptLines $SpixifyLine1 -echo $TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\' -$TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\' +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\' progexit=\$? if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then echo $ToRun @PgmArgs \\< $PgmStdinFile