diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-10-08 16:30:20 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-10-23 13:52:35 +1300 |
| commit | 1285d4f4678e4e2082c8ebe5655ed6df157a4872 (patch) | |
| tree | 16596a27afa7d7e5e75bf2bc2ce319c26cb46288 | |
| parent | c562b5bd9d994c45bb6752be756c44c6d0df880b (diff) | |
| download | rust-1285d4f4678e4e2082c8ebe5655ed6df157a4872.tar.gz rust-1285d4f4678e4e2082c8ebe5655ed6df157a4872.zip | |
Remove support for .rc files from test.mk
| -rw-r--r-- | mk/tests.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index f46064ebe82..07e13057e36 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -491,17 +491,11 @@ $(foreach host,$(CFG_HOST), \ # Rules for the compiletest tests (rpass, rfail, etc.) ###################################################################### -RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc) RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs) -RPASS_VALGRIND_RC := $(wildcard $(S)src/test/run-pass-valgrind/*.rc) RPASS_VALGRIND_RS := $(wildcard $(S)src/test/run-pass-valgrind/*.rs) -RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc) RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs) -CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc) CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs) -RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc) RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs) -CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc) CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs) BENCH_RS := $(wildcard $(S)src/test/bench/*.rs) PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs) @@ -514,12 +508,12 @@ CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc) # a performance monitor. PERF_RS := $(wildcard $(S)src/test/bench/*.rs) -RPASS_TESTS := $(RPASS_RC) $(RPASS_RS) -RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RC) $(RPASS_VALGRIND_RS) -RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS) -CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS) -RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS) -CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS) +RPASS_TESTS := $(RPASS_RS) +RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS) +RPASS_FULL_TESTS := $(RPASS_FULL_RS) +CFAIL_FULL_TESTS := $(CFAIL_FULL_RS) +RFAIL_TESTS := $(RFAIL_RS) +CFAIL_TESTS := $(CFAIL_RS) BENCH_TESTS := $(BENCH_RS) PERF_TESTS := $(PERF_RS) PRETTY_TESTS := $(PRETTY_RS) |