Remove trailing CRs with sed rather than relying on diff in nofib
authorIan Lynagh <igloo@earth.li>
Thu, 7 Sep 2006 11:20:27 +0000 (11:20 +0000)
committerIan Lynagh <igloo@earth.li>
Thu, 7 Sep 2006 11:20:27 +0000 (11:20 +0000)
Some diffs don't understand --strip-trailing-cr.

utils/runstdtest/runstdtest.prl

index 752e6af..da08173 100644 (file)
@@ -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