From: Tor Lillqvist <tml@iki.fi>
Date: Sun, 15 Jun 2003 22:57:21 +0000 (+0000)
Subject: Remove CRs from the out file before comparing (needed on Windows).
X-Git-Tag: fc-2_2_91~17
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=231051f41669095db4a2c5680a0945fb1ff45a2d;p=fontconfig.git

Remove CRs from the out file before comparing (needed on Windows).
---

diff --git a/ChangeLog b/ChangeLog
index 5b8e2e9..4454212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-06-15  Tor Lillqvist  <tml@iki.fi>
 
+	* test/run-test.sh (FONTCONFIG_FILE): Remove CRs from the out file
+	before comparing (needed on Windows).
+
 	* src/Makefile.am (install-libtool-import-lib): Fix cut&paste error.
 
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
diff --git a/test/run-test.sh b/test/run-test.sh
index b2600d7..ae5af1e 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -13,6 +13,7 @@ check () {
   $FCLIST - family pixelsize | sort >> out
   echo "=" >> out
   $FCLIST - family pixelsize | sort >> out
+  tr -d '\015' <out >out.tmp; mv out.tmp out
   if cmp out out.expected > /dev/null ; then : ; else
     echo "*** Test failed: $TEST"
     echo "*** output is in 'out', expected output in 'out.expected'"