From: Ian Lynagh <igloo@earth.li>
Date: Tue, 5 Sep 2006 18:49:10 +0000 (+0000)
Subject: Strip trailing CRs when comparing output for nofib. Fixes #797.
X-Git-Tag: Before_FC_branch_merge~68
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3c604148f96f21b27aaeacad6da461ee088a9f73

Strip trailing CRs when comparing output for nofib. Fixes #797.
---

diff --git a/utils/runstdtest/runstdtest.prl b/utils/runstdtest/runstdtest.prl
index 1b1af9f..752e6af 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 cmp -s \$out_file $TmpPrefix/runtest$$.1 ; then
+	if diff --strip-trailing-cr \$out_file $TmpPrefix/runtest$$.1 > /dev/null 2>&1 ; then
 	    hit='YES'
 	fi
     done
@@ -249,7 +249,7 @@ fi
 
 hit='NO'
 for out_file in @PgmStderrFile ; do
-    if cmp -s \$out_file $TmpPrefix/runtest$$.2 ; then
+    if diff --strip-trailing-cr \$out_file $TmpPrefix/runtest$$.2 > /dev/null 2>&1 ; then
 	hit='YES'
     fi
 done