Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3cbd98e

Browse files
committedApr 2, 2014
Two fixes to get make check-stage1 working.
1. Fix a long-standing typo in the makefile: the relevant CTEST_NAME here is `rpass-full` (with a dash), not `rpass_full`. 2. The rpass-full tests depend on the complete set of target libraries. Therefore, the rpass-full tests need to use the dependencies held in the CSREQ-prefixed variable, not the TLIBRUSTC_DEFAULT-prefixed variable.
1 parent 2cddd68 commit 3cbd98e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
560560
$$(CTEST_TESTARGS)
561561

562562
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
563-
CTEST_DEPS_rpass_full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
563+
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(2)_H_$(3))
564564
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
565565
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
566566
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)

4 commit comments

Comments
 (4)

bors commented on Apr 2, 2014

@bors
Collaborator

saw approval from huonw
at pnkfelix@3cbd98e

bors commented on Apr 2, 2014

@bors
Collaborator

merging pnkfelix/rust/fsk-fix-13247 = 3cbd98e into auto

bors commented on Apr 2, 2014

@bors
Collaborator

pnkfelix/rust/fsk-fix-13247 = 3cbd98e merged ok, testing candidate = c3a7e6fa

Please sign in to comment.