diff options
| author | Ben Wagner <bungeman@chromium.org> | 2020-12-15 17:39:05 -0500 |
|---|---|---|
| committer | Ben Wagner <bungeman@chromium.org> | 2020-12-15 19:44:48 -0500 |
| commit | b35c72dbc7da5b61a84766cfa431c95c1d1b35bd (patch) | |
| tree | dd4a0d280125554e2d7c12431f171fd6b9546767 | |
| parent | 5cd11d19dfb2d901e1f6b690ae504d3bf5f5ff69 (diff) | |
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.
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/run-test-conf.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 5a998b3..1a9b293 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -101,8 +101,8 @@ if ENABLE_JSONC check_PROGRAMS += test-conf test_conf_CFLAGS = $(JSONC_CFLAGS) test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS) -TESTS += run-test-conf.sh endif +TESTS += run-test-conf.sh check_PROGRAMS += test-bz106618 test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la diff --git a/test/run-test-conf.sh b/test/run-test-conf.sh index 437bafa..e085e82 100644 --- a/test/run-test-conf.sh +++ b/test/run-test-conf.sh @@ -33,6 +33,12 @@ BUILDTESTDIR=${builddir-"$MyPWD"} 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 \ 60-generic.conf \ 90-synthetic.conf \ |