projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9a11883
)
fix getting the exit code
author
Simon Marlow
<simonmar@microsoft.com>
Fri, 24 Aug 2007 13:12:45 +0000
(13:12 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Fri, 24 Aug 2007 13:12:45 +0000
(13:12 +0000)
utils/runstdtest/runstdtest.prl
patch
|
blob
|
history
diff --git
a/utils/runstdtest/runstdtest.prl
b/utils/runstdtest/runstdtest.prl
index
7d58d93
..
379c895
100644
(file)
--- a/
utils/runstdtest/runstdtest.prl
+++ b/
utils/runstdtest/runstdtest.prl
@@
-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\'
$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
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
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
if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then
echo $ToRun @PgmArgs \\< $PgmStdinFile
echo "****" expected a failure, but was successful