about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2013-02-19 02:08:03 +0100
committerMarvin Löbel <loebel.marvin@gmail.com>2013-02-19 02:22:14 +0100
commit702a6f7a189a3b7921c622b0ea2e0aa5111c94c8 (patch)
tree5ea6d5d3cf0ad99d6c6d77e206eb30dce8292ace
parent726fc877d1593b526cf8d1b197228c53e781ee82 (diff)
Attempt to solve make check test ambiguity betwen crate 'rust' and extratected doc 'rust'
-rw-r--r--mk/tests.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index 5daddf98ee8..116f6ffe568 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -470,20 +470,20 @@ $(foreach host,$(CFG_TARGET_TRIPLES), \
 
 define DEF_RUN_DOC_TEST
 
-DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
+DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4) := \
         $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3))	\
         --src-base $(3)/test/doc-$(4)/	\
         --build-base $(3)/test/doc-$(4)/	\
         --mode run-pass
 
-check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
+check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
 
-$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
+$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
 	        $$(TEST_SREQ$(1)_T_$(2)_H_$(3))		\
                 doc-$(4)-extract$(3)
 	@$$(call E, run doc-$(4): $$<)
 	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
-                $$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
+                $$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4)) \
 		--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),doc-$(4)) \
                 && touch $$@