@@ -287,6 +287,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
287
287
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rfail-exec \
288
288
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-exec \
289
289
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-full-exec \
290
+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-full-exec \
290
291
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rmake-exec \
291
292
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -crates-exec \
292
293
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -doc-crates-exec \
@@ -440,6 +441,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
440
441
RPASS_RS := $(wildcard $(S ) src/test/run-pass/* .rs)
441
442
RPASS_FULL_RC := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rc)
442
443
RPASS_FULL_RS := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rs)
444
+ CFAIL_FULL_RC := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rc)
445
+ CFAIL_FULL_RS := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rs)
443
446
RFAIL_RC := $(wildcard $(S ) src/test/run-fail/* .rc)
444
447
RFAIL_RS := $(wildcard $(S ) src/test/run-fail/* .rs)
445
448
CFAIL_RC := $(wildcard $(S ) src/test/compile-fail/* .rc)
@@ -456,6 +459,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
456
459
457
460
RPASS_TESTS := $(RPASS_RC ) $(RPASS_RS )
458
461
RPASS_FULL_TESTS := $(RPASS_FULL_RC ) $(RPASS_FULL_RS )
462
+ CFAIL_FULL_TESTS := $(CFAIL_FULL_RC ) $(CFAIL_FULL_RS )
459
463
RFAIL_TESTS := $(RFAIL_RC ) $(RFAIL_RS )
460
464
CFAIL_TESTS := $(CFAIL_RC ) $(CFAIL_RS )
461
465
BENCH_TESTS := $(BENCH_RS )
@@ -474,6 +478,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
474
478
CTEST_MODE_rpass-full = run-pass
475
479
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL )
476
480
481
+ CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
482
+ CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
483
+ CTEST_MODE_cfail-full = compile-fail
484
+ CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL )
485
+
477
486
CTEST_SRC_BASE_rfail = run-fail
478
487
CTEST_BUILD_BASE_rfail = run-fail
479
488
CTEST_MODE_rfail = run-fail
@@ -572,6 +581,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
572
581
573
582
CTEST_DEPS_rpass_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_TESTS )
574
583
CTEST_DEPS_rpass-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
584
+ CTEST_DEPS_cfail-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
575
585
CTEST_DEPS_rfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RFAIL_TESTS )
576
586
CTEST_DEPS_cfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_TESTS )
577
587
CTEST_DEPS_bench_$(1 ) -T-$(2 ) -H-$(3 ) = $$(BENCH_TESTS )
@@ -640,7 +650,7 @@ endif
640
650
641
651
endef
642
652
643
- CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
653
+ CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo codegen
644
654
645
655
$(foreach host,$(CFG_HOST), \
646
656
$(eval $(foreach target,$(CFG_TARGET), \
@@ -783,6 +793,7 @@ TEST_GROUPS = \
783
793
$(foreach crate,$(TEST_DOC_CRATES ) ,doc-crate-$(crate ) ) \
784
794
rpass \
785
795
rpass-full \
796
+ cfail-full \
786
797
rfail \
787
798
cfail \
788
799
bench \
0 commit comments