summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAkira TAGOH <akira@tagoh.org>2017-05-31 18:25:01 +0900
committerAkira TAGOH <akira@tagoh.org>2017-05-31 20:08:16 +0900
commitd33be230293978ad3f94b184f2c2770c108269c2 (patch)
tree7132a3a73dffa975ccd98e0266b71e2b5eed56e0 /test
parent3072f14bddfeb0adba52bce26d7b752207a2cffb (diff)
Fix make check fail with freetype-2.7.1 and 2.8 with PCF_CONFIG_OPTION_LONG_FAMILY_NAMES enabled.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 92e92bef..df12587d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,8 @@
+if FREETYPE_PCF_LONG_FAMILY_NAMES
+check_SCRIPTS=run-test271.sh
+else
check_SCRIPTS=run-test.sh
+endif
TEST_EXTENSIONS = \
.sh \
$(NULL)
@@ -10,13 +14,13 @@ AM_TESTS_ENVIRONMENT= \
SH_LOG_COMPILER = sh
-if FREETYPE_2_7_1
+if FREETYPE_PCF_LONG_FAMILY_NAMES
TESTS=run-test271.sh
else
TESTS=run-test.sh
endif
-TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+TESTDATA=4x6.pcf 8x16.pcf out.expected out271.expected fonts.conf.in
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -46,7 +50,7 @@ check_PROGRAMS += test-bz96676
test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
TESTS += test-bz96676
-EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)
+EXTRA_DIST=run-test.sh run-test271.sh $(TESTDATA)
CLEANFILES=