Skip to content

Commit f74423e

Browse files
committed
---
yaml --- r: 157433 b: refs/heads/snap-stage3 c: 1285d4f h: refs/heads/master i: 157431: bf3c65a v: v3
1 parent 149a300 commit f74423e

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 065caf34f5ff29e04605f95d9c5d511af219439a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c562b5bd9d994c45bb6752be756c44c6d0df880b
4+
refs/heads/snap-stage3: 1285d4f4678e4e2082c8ebe5655ed6df157a4872
55
refs/heads/try: 0ee4d8b0b112c608646fa75463ab4dc59132efd9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)