summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2006-09-07 11:20:27 +0000
committerIan Lynagh <igloo@earth.li>2006-09-07 11:20:27 +0000
commit9491f55ce4ab4ea288674c6a0cc174bb8673c7a1 (patch)
tree20e755ed75ae20633f68213d7aedf5024d380113 /utils
parent5d7b55731e31c04ba76d670d0176e32f121fc5e4 (diff)
downloadhaskell-9491f55ce4ab4ea288674c6a0cc174bb8673c7a1.tar.gz
Remove trailing CRs with sed rather than relying on diff in nofib
Some diffs don't understand --strip-trailing-cr.
Diffstat (limited to 'utils')
-rw-r--r--utils/runstdtest/runstdtest.prl4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 752e6af073..da081736dd 100644
--- a/utils/runstdtest/runstdtest.prl
+++ b/utils/runstdtest/runstdtest.prl
@@ -223,7 +223,7 @@ else
$PostScriptLines
hit='NO'
for out_file in @PgmStdoutFile ; do
- if diff --strip-trailing-cr \$out_file $TmpPrefix/runtest$$.1 > /dev/null 2>&1 ; then
+ if sed "s/\\r\$//" $TmpPrefix/runtest$$.1 | cmp -s \$out_file - ; then
hit='YES'
fi
done
@@ -249,7 +249,7 @@ fi
hit='NO'
for out_file in @PgmStderrFile ; do
- if diff --strip-trailing-cr \$out_file $TmpPrefix/runtest$$.2 > /dev/null 2>&1 ; then
+ if sed "s/\\r\$//" $TmpPrefix/runtest$$.2 | cmp -s \$out_file - ; then
hit='YES'
fi
done