Skip to content

Commit

Permalink
Attempt to solve make check test ambiguity betwen crate 'rust' and ex…
Browse files Browse the repository at this point in the history
…tratected doc 'rust'
  • Loading branch information
Kimundi committed Feb 19, 2013
1 parent 726fc87 commit 702a6f7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mk/tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 $$@

Expand Down

5 comments on commit 702a6f7

@bors
Copy link
Contributor

@bors bors commented on 702a6f7 Feb 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from graydon
at Kimundi@702a6f7

@bors
Copy link
Contributor

@bors bors commented on 702a6f7 Feb 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Kimundi/rust/incoming = 702a6f7 into auto

@bors
Copy link
Contributor

@bors bors commented on 702a6f7 Feb 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kimundi/rust/incoming = 702a6f7 merged ok, testing candidate = a8efa21

@bors
Copy link
Contributor

@bors bors commented on 702a6f7 Feb 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 702a6f7 Feb 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = a8efa21

Please sign in to comment.