summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2003-06-15 22:57:21 +0000
committerTor Lillqvist <tml@iki.fi>2003-06-15 22:57:21 +0000
commit231051f41669095db4a2c5680a0945fb1ff45a2d (patch)
tree9b42e9706e02146a0a8ccc555710508d73ccde03
parent92af858f2a7dcc972bf482397ac75d7e0ca38dd9 (diff)
Remove CRs from the out file before comparing (needed on Windows).
-rw-r--r--ChangeLog3
-rw-r--r--test/run-test.sh1
2 files changed, 4 insertions, 0 deletions
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'"