From 3cbd98e43f6436aaddd4f83860609f91dc517c92 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Wed, 2 Apr 2014 11:47:19 +0200 Subject: [PATCH] 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. --- mk/tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/tests.mk b/mk/tests.mk index 7fd6d148f38..df6b7e93759 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -560,7 +560,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \ $$(CTEST_TESTARGS) CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS) -CTEST_DEPS_rpass_full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3)) +CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(2)_H_$(3)) CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS) CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS) CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)