From 3c4ff1b872e1d1fd4e905f9a9ac3aeec5397608d Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Sun, 9 Mar 2014 14:55:20 +1100 Subject: [PATCH] mk: rename `check-...-doc-` to `check-...-doc-crate-`. E.g. this stops check-...-doc rules for `rustdoc.md` and `librustdoc` from stamping on each other, so that they are correctly built and tested. (Previously only the rustdoc crate was tested.) --- mk/tests.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mk/tests.mk b/mk/tests.mk index 8f48918d31a..23433a4705a 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -309,7 +309,7 @@ endif check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \ $$(foreach crate,$$(TEST_DOC_CRATES), \ - check-stage$(1)-T-$(2)-H-$(3)-doc-$$(crate)-exec) + check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$$(crate)-exec) check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \ $$(foreach docname,$$(DOCS), \ @@ -721,15 +721,16 @@ else CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4)) endif -check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)) +check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$(4)-exec: \ + $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)) ifeq ($(2),$$(CFG_BUILD)) -$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4)) - @$$(call E, run doc-$(4) [$(2)]) +$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4)) + @$$(call E, run doc-crate-$(4) [$(2)]) $$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test \ $$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@ else -$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): +$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): touch $$@ endif @@ -748,7 +749,7 @@ $(foreach host,$(CFG_HOST), \ TEST_GROUPS = \ crates \ $(foreach crate,$(TEST_CRATES),$(crate)) \ - $(foreach crate,$(TEST_DOC_CRATES),doc-$(crate)) \ + $(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \ rpass \ rpass-full \ rfail \ @@ -830,7 +831,7 @@ define DEF_CHECK_DOC_FOR_STAGE check-stage$(1)-docs: $$(foreach docname,$$(DOCS),\ check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \ $$(foreach crate,$$(TEST_DOC_CRATES),\ - check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(crate)) + check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate)) endef $(foreach stage,$(STAGES), \