From a3f872020dd60e0c5ce97e615aec9e8f25711a8d Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Mon, 14 Aug 2017 08:02:35 -0400
Subject: [PATCH] Move qtest invocation into rules.mk

---
 Makefile      | 14 ++------------
 make/rules.mk | 15 +++++++++++++++
 2 files changed, 17 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_,,$@))
diff --git a/make/rules.mk b/make/rules.mk
index efeb9a7f..09401cd3 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -47,3 +47,18 @@ depflags=-MD -MF $(1).dep -MP
 else
 depflags=
 endif
+
+# Usage: $(call run_qtest,dir)
+define run_qtest
+	@echo running qtest-driver for $(1)
+	@(cd $(1)/$(OUTPUT_DIR); \
+         if TC_SRCS="$(foreach T,$(TC_SRCS_$(1)),../../$(T))" \
+	 $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \
+	    true; \
+	 else \
+	    if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \
+	       cat -v qtest.log; \
+	    fi; \
+	    false; \
+	 fi)
+endef