Commit a3f872020dd60e0c5ce97e615aec9e8f25711a8d
1 parent
ae0399ef
Move qtest invocation into rules.mk
Showing
2 changed files
with
17 additions
and
12 deletions
Makefile
| @@ -79,7 +79,7 @@ TEST_TARGETS = $(foreach B,$(TEST_ITEMS),check_$(B)) | @@ -79,7 +79,7 @@ TEST_TARGETS = $(foreach B,$(TEST_ITEMS),check_$(B)) | ||
| 79 | 79 | ||
| 80 | CLEAN_TARGETS = $(foreach B,$(BUILD_ITEMS),clean_$(B)) | 80 | CLEAN_TARGETS = $(foreach B,$(BUILD_ITEMS),clean_$(B)) |
| 81 | 81 | ||
| 82 | -# For test suitse | 82 | +# For test suites |
| 83 | export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf) | 83 | export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf) |
| 84 | export QPDF_SKIP_TEST_COMPARE_IMAGES | 84 | export QPDF_SKIP_TEST_COMPARE_IMAGES |
| 85 | export QPDF_LARGE_FILE_TEST_PATH | 85 | export QPDF_LARGE_FILE_TEST_PATH |
| @@ -128,14 +128,4 @@ check: $(TEST_TARGETS) | @@ -128,14 +128,4 @@ check: $(TEST_TARGETS) | ||
| 128 | 128 | ||
| 129 | QTEST=$(abspath qtest/bin/qtest-driver) | 129 | QTEST=$(abspath qtest/bin/qtest-driver) |
| 130 | $(TEST_TARGETS): | 130 | $(TEST_TARGETS): |
| 131 | - @echo running qtest-driver for $(subst check_,,$@) | ||
| 132 | - @(cd $(subst check_,,$@)/$(OUTPUT_DIR); \ | ||
| 133 | - if TC_SRCS="$(foreach T,$(TC_SRCS_$(subst check_,,$@)),../../$(T))" \ | ||
| 134 | - $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \ | ||
| 135 | - true; \ | ||
| 136 | - else \ | ||
| 137 | - if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \ | ||
| 138 | - cat -v qtest.log; \ | ||
| 139 | - fi; \ | ||
| 140 | - false; \ | ||
| 141 | - fi) | 131 | + $(call run_qtest,$(subst check_,,$@)) |
make/rules.mk
| @@ -47,3 +47,18 @@ depflags=-MD -MF $(1).dep -MP | @@ -47,3 +47,18 @@ depflags=-MD -MF $(1).dep -MP | ||
| 47 | else | 47 | else |
| 48 | depflags= | 48 | depflags= |
| 49 | endif | 49 | endif |
| 50 | + | ||
| 51 | +# Usage: $(call run_qtest,dir) | ||
| 52 | +define run_qtest | ||
| 53 | + @echo running qtest-driver for $(1) | ||
| 54 | + @(cd $(1)/$(OUTPUT_DIR); \ | ||
| 55 | + if TC_SRCS="$(foreach T,$(TC_SRCS_$(1)),../../$(T))" \ | ||
| 56 | + $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \ | ||
| 57 | + true; \ | ||
| 58 | + else \ | ||
| 59 | + if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \ | ||
| 60 | + cat -v qtest.log; \ | ||
| 61 | + fi; \ | ||
| 62 | + false; \ | ||
| 63 | + fi) | ||
| 64 | +endef |