@@ -288,6 +288,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
288
288
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rfail-exec \
289
289
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-exec \
290
290
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-full-exec \
291
+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-full-exec \
291
292
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rmake-exec \
292
293
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -crates-exec \
293
294
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -doc-crates-exec \
@@ -451,6 +452,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
451
452
RPASS_RS := $(wildcard $(S ) src/test/run-pass/* .rs)
452
453
RPASS_FULL_RC := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rc)
453
454
RPASS_FULL_RS := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rs)
455
+ CFAIL_FULL_RC := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rc)
456
+ CFAIL_FULL_RS := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rs)
454
457
RFAIL_RC := $(wildcard $(S ) src/test/run-fail/* .rc)
455
458
RFAIL_RS := $(wildcard $(S ) src/test/run-fail/* .rs)
456
459
CFAIL_RC := $(wildcard $(S ) src/test/compile-fail/* .rc)
@@ -467,6 +470,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
467
470
468
471
RPASS_TESTS := $(RPASS_RC ) $(RPASS_RS )
469
472
RPASS_FULL_TESTS := $(RPASS_FULL_RC ) $(RPASS_FULL_RS )
473
+ CFAIL_FULL_TESTS := $(CFAIL_FULL_RC ) $(CFAIL_FULL_RS )
470
474
RFAIL_TESTS := $(RFAIL_RC ) $(RFAIL_RS )
471
475
CFAIL_TESTS := $(CFAIL_RC ) $(CFAIL_RS )
472
476
BENCH_TESTS := $(BENCH_RS )
@@ -485,6 +489,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
485
489
CTEST_MODE_rpass-full = run-pass
486
490
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL )
487
491
492
+ CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
493
+ CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
494
+ CTEST_MODE_cfail-full = compile-fail
495
+ CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL )
496
+
488
497
CTEST_SRC_BASE_rfail = run-fail
489
498
CTEST_BUILD_BASE_rfail = run-fail
490
499
CTEST_MODE_rfail = run-fail
@@ -583,6 +592,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
583
592
584
593
CTEST_DEPS_rpass_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_TESTS )
585
594
CTEST_DEPS_rpass-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
595
+ CTEST_DEPS_cfail-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
586
596
CTEST_DEPS_rfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RFAIL_TESTS )
587
597
CTEST_DEPS_cfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_TESTS )
588
598
CTEST_DEPS_bench_$(1 ) -T-$(2 ) -H-$(3 ) = $$(BENCH_TESTS )
@@ -651,7 +661,7 @@ endif
651
661
652
662
endef
653
663
654
- CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
664
+ CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo codegen
655
665
656
666
$(foreach host,$(CFG_HOST), \
657
667
$(eval $(foreach target,$(CFG_TARGET), \
@@ -794,6 +804,7 @@ TEST_GROUPS = \
794
804
$(foreach crate,$(TEST_DOC_CRATES ) ,doc-crate-$(crate ) ) \
795
805
rpass \
796
806
rpass-full \
807
+ cfail-full \
797
808
rfail \
798
809
cfail \
799
810
bench \
0 commit comments