diff options
| author | Akira TAGOH <akira@tagoh.org> | 2017-11-20 17:20:34 +0530 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2017-11-20 17:29:39 +0530 |
| commit | 64895e719dd8d18c52a31d66cd189915bc8c00b8 (patch) | |
| tree | e6d0c7e99df095d8622b9d95e43de2655ef634b0 /test | |
| parent | e73b5dcbf2248b538e06bc92a71700dacbec983b (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/out.expected-long-family-names (renamed from test/out.expected) | 0 | ||||
| -rw-r--r-- | test/out.expected-no-long-family-names | 8 | ||||
| -rw-r--r-- | test/run-test.sh | 2 |
4 files changed, 20 insertions, 2 deletions
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-long-family-names index d0697236..d0697236 100644 --- a/test/out.expected +++ b/test/out.expected-long-family-names 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 |