summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2017-08-14 14:02:35 +0200
committerJay Berkenbilt <ejb@ql.org>2017-08-16 13:57:08 +0200
commita3f872020dd60e0c5ce97e615aec9e8f25711a8d (patch)
treeff0b9e03152d83597620b8c14ffde565aee6bb6e /Makefile
parentae0399ef87cc7e93dc348b682fa0000aa477e302 (diff)
downloadqpdf-a3f872020dd60e0c5ce97e615aec9e8f25711a8d.tar.zst
Move qtest invocation into rules.mk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 5de0c05f..3a53e93e 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ TEST_TARGETS = $(foreach B,$(TEST_ITEMS),check_$(B))
CLEAN_TARGETS = $(foreach B,$(BUILD_ITEMS),clean_$(B))
-# For test suitse
+# For test suites
export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf)
export QPDF_SKIP_TEST_COMPARE_IMAGES
export QPDF_LARGE_FILE_TEST_PATH
@@ -128,14 +128,4 @@ check: $(TEST_TARGETS)
QTEST=$(abspath qtest/bin/qtest-driver)
$(TEST_TARGETS):
- @echo running qtest-driver for $(subst check_,,$@)
- @(cd $(subst check_,,$@)/$(OUTPUT_DIR); \
- if TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \
- $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \
- true; \
- else \
- if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \
- cat -v qtest.log; \
- fi; \
- false; \
- fi)
+ $(call run_qtest,$(subst check_,,$@))