From: Ian Lynagh <igloo@earth.li>
Date: Thu, 7 Sep 2006 11:20:27 +0000 (+0000)
Subject: Remove trailing CRs with sed rather than relying on diff in nofib
X-Git-Tag: Before_FC_branch_merge~49
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9491f55ce4ab4ea288674c6a0cc174bb8673c7a1;p=ghc-hetmet.git

Remove trailing CRs with sed rather than relying on diff in nofib
Some diffs don't understand --strip-trailing-cr.
---

diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 752e6af..da08173 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