OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mk: rename `check-...-doc-<crate>` to `check-...-doc-crate-<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.)
This commit is contained in:
Huon Wilson 2014-03-09 14:55:20 +11:00
parent f7833215b0
commit 3c4ff1b872
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mk/tests.mk
View File

@ -309,7 +309,7 @@ endif
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \ check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \
$$(foreach crate,$$(TEST_DOC_CRATES), \ $$(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: \ check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
$$(foreach docname,$$(DOCS), \ $$(foreach docname,$$(DOCS), \
@ -721,15 +721,16 @@ else
CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4)) CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4))
endif 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)) ifeq ($(2),$$(CFG_BUILD))
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4)) $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4))
@$$(call E, run doc-$(4) [$(2)]) @$$(call E, run doc-crate-$(4) [$(2)])
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test \ $$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test \
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@ $$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
else else
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)):
touch $$@ touch $$@
endif endif
@ -748,7 +749,7 @@ $(foreach host,$(CFG_HOST), \
TEST_GROUPS = \ TEST_GROUPS = \
crates \ crates \
$(foreach crate,$(TEST_CRATES),$(crate)) \ $(foreach crate,$(TEST_CRATES),$(crate)) \
$(foreach crate,$(TEST_DOC_CRATES),doc-$(crate)) \ $(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
rpass \ rpass \
rpass-full \ rpass-full \
rfail \ rfail \
@ -830,7 +831,7 @@ define DEF_CHECK_DOC_FOR_STAGE
check-stage$(1)-docs: $$(foreach docname,$$(DOCS),\ check-stage$(1)-docs: $$(foreach docname,$$(DOCS),\
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \ check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \
$$(foreach crate,$$(TEST_DOC_CRATES),\ $$(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 endef
$(foreach stage,$(STAGES), \ $(foreach stage,$(STAGES), \