From 64895e719dd8d18c52a31d66cd189915bc8c00b8 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 20 Nov 2017 17:20:34 +0530
Subject: Add the check of PCF_CONFIG_OPTION_LONG_FAMILY_NAMES back

This isn't enabled by default in freetype so need to check it for testsuites
---
 test/Makefile.am                       | 12 +++++++++++-
 test/out.expected                      |  8 --------
 test/out.expected-long-family-names    |  8 ++++++++
 test/out.expected-no-long-family-names |  8 ++++++++
 test/run-test.sh                       |  2 +-
 5 files changed, 28 insertions(+), 10 deletions(-)
 delete mode 100644 test/out.expected
 create mode 100644 test/out.expected-long-family-names
 create mode 100644 test/out.expected-no-long-family-names

(limited to 'test')

diff --git a/test/Makefile.am b/test/Makefile.am
index 9f8fe656..2e7f2433 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,11 +8,21 @@ AM_TESTS_ENVIRONMENT= \
 	EXEEXT=${EXEEXT}; export EXEEXT; \
 	$(NULL)
 
+BUILT_SOURCES = out.expected
+
 SH_LOG_COMPILER = sh
 TESTS=run-test.sh
 
 TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
 
+if FREETYPE_PCF_LONG_FAMILY_NAMES
+out.expected: $(srcdir)/out.expected-long-family-names
+	cp $(srcdir)/out.expected-long-family-names out.expected
+else
+out.expected: $(srcdir)/out.expected-no-long-family-names
+	cp $(srcdir)/out.expected-no-long-family-names out.expected
+endif
+
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 
 check_PROGRAMS =
@@ -45,7 +55,7 @@ check_PROGRAMS += test-bz96676
 test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
 TESTS += test-bz96676
 
-EXTRA_DIST=run-test.sh $(TESTDATA)
+EXTRA_DIST=run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
 
 CLEANFILES=
 
diff --git a/test/out.expected b/test/out.expected
deleted file mode 100644
index d0697236..00000000
--- a/test/out.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-Misc Fixed:pixelsize=6
-Sony Fixed:pixelsize=16
-=
-Misc Fixed:pixelsize=6
-Sony Fixed:pixelsize=16
-=
-Misc Fixed:pixelsize=6
-Sony Fixed:pixelsize=16
diff --git a/test/out.expected-long-family-names b/test/out.expected-long-family-names
new file mode 100644
index 00000000..d0697236
--- /dev/null
+++ b/test/out.expected-long-family-names
@@ -0,0 +1,8 @@
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
+=
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
+=
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
diff --git a/test/out.expected-no-long-family-names b/test/out.expected-no-long-family-names
new file mode 100644
index 00000000..39634c50
--- /dev/null
+++ b/test/out.expected-no-long-family-names
@@ -0,0 +1,8 @@
+Fixed:pixelsize=16
+Fixed:pixelsize=6
+=
+Fixed:pixelsize=16
+Fixed:pixelsize=6
+=
+Fixed:pixelsize=16
+Fixed:pixelsize=6
diff --git a/test/run-test.sh b/test/run-test.sh
index 0697f722..e5bc32c3 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -46,7 +46,7 @@ check () {
   echo "=" >> out
   $FCLIST - family pixelsize | sort >> out
   tr -d '\015' <out >out.tmp; mv out.tmp out
-  if cmp out $TESTDIR/$EXPECTED > /dev/null ; then : ; else
+  if cmp out $EXPECTED > /dev/null ; then : ; else
     echo "*** Test failed: $TEST"
     echo "*** output is in 'out', expected output in '$EXPECTED'"
     exit 1
-- 
cgit v1.2.3