From 231051f41669095db4a2c5680a0945fb1ff45a2d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 15 Jun 2003 22:57:21 +0000 Subject: [PATCH] Remove CRs from the out file before comparing (needed on Windows). --- ChangeLog | 3 +++ test/run-test.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5b8e2e9..4454212 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-06-15 Tor Lillqvist + * 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 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.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'" -- 2.39.5