Skip to content

Commit 1285d4f

Browse files
committed
Remove support for .rc files from test.mk
1 parent c562b5b commit 1285d4f

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

mk/tests.mk

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -491,17 +491,11 @@ $(foreach host,$(CFG_HOST), \
491491
# Rules for the compiletest tests (rpass, rfail, etc.)
492492
######################################################################
493493

494-
RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
495494
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
496-
RPASS_VALGRIND_RC := $(wildcard $(S)src/test/run-pass-valgrind/*.rc)
497495
RPASS_VALGRIND_RS := $(wildcard $(S)src/test/run-pass-valgrind/*.rs)
498-
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
499496
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
500-
CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
501497
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
502-
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
503498
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
504-
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
505499
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
506500
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
507501
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
@@ -514,12 +508,12 @@ CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
514508
# a performance monitor.
515509
PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
516510

517-
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
518-
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RC) $(RPASS_VALGRIND_RS)
519-
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
520-
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
521-
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
522-
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
511+
RPASS_TESTS := $(RPASS_RS)
512+
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
513+
RPASS_FULL_TESTS := $(RPASS_FULL_RS)
514+
CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
515+
RFAIL_TESTS := $(RFAIL_RS)
516+
CFAIL_TESTS := $(CFAIL_RS)
523517
BENCH_TESTS := $(BENCH_RS)
524518
PERF_TESTS := $(PERF_RS)
525519
PRETTY_TESTS := $(PRETTY_RS)

0 commit comments

Comments
 (0)