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

diff --git a/ChangeLog b/ChangeLog
index 5b8e2e99e27133f4a802043583dc14efea924f13..445421252319f42faea3f5e375ce22520a48098c 100644 (file)
--- 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 b2600d78f9bf7a869570ea0e721994c4f2d968d3..ae5af1eb7f7eaae6dbe6d59f2a701aedfd1b6ab8 100644 (file)
--- 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'"