walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always run-test-conf, but skip if not built. 

The test-conf test requires libjson-c to be available in order to be
built. However, there has been no user indication that additional tests
could be built if the json-c development files were available.

Continue to not build test-conf if json-c is not available, but do run
the test harness. The test harness is updated to SKIP the test if the
test-conf binary is unavailable.
This commit is contained in:
Ben Wagner 2020-12-15 17:39:05 -05:00
parent 5cd11d19df
commit b35c72dbc7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile.am
View File

@ -101,8 +101,8 @@ if ENABLE_JSONC
check_PROGRAMS += test-conf check_PROGRAMS += test-conf
test_conf_CFLAGS = $(JSONC_CFLAGS) test_conf_CFLAGS = $(JSONC_CFLAGS)
test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS) test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS)
TESTS += run-test-conf.sh
endif endif
TESTS += run-test-conf.sh
check_PROGRAMS += test-bz106618 check_PROGRAMS += test-bz106618
test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la

6
test/run-test-conf.sh
View File

@ -33,6 +33,12 @@ BUILDTESTDIR=${builddir-"$MyPWD"}
RUNNER=../test/test-conf$EXEEXT RUNNER=../test/test-conf$EXEEXT
if [ ! -f ${RUNNER} ]; then
echo "${RUNNER} not found!\n"
echo "Building this test requires libjson-c development files to be available."
exit 77 # SKIP
fi
for i in \ for i in \
60-generic.conf \ 60-generic.conf \
90-synthetic.conf \ 90-synthetic.conf \