@@ -287,6 +287,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
287287 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rfail-exec \
288288 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-exec \
289289 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-full-exec \
290+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-full-exec \
290291 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rmake-exec \
291292 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -crates-exec \
292293 check-stage$(1 ) -T-$(2 ) -H-$(3 ) -doc-crates-exec \
@@ -440,6 +441,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
440441RPASS_RS := $(wildcard $(S ) src/test/run-pass/* .rs)
441442RPASS_FULL_RC := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rc)
442443RPASS_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)
443446RFAIL_RC := $(wildcard $(S ) src/test/run-fail/* .rc)
444447RFAIL_RS := $(wildcard $(S ) src/test/run-fail/* .rs)
445448CFAIL_RC := $(wildcard $(S ) src/test/compile-fail/* .rc)
@@ -456,6 +459,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
456459
457460RPASS_TESTS := $(RPASS_RC ) $(RPASS_RS )
458461RPASS_FULL_TESTS := $(RPASS_FULL_RC ) $(RPASS_FULL_RS )
462+ CFAIL_FULL_TESTS := $(CFAIL_FULL_RC ) $(CFAIL_FULL_RS )
459463RFAIL_TESTS := $(RFAIL_RC ) $(RFAIL_RS )
460464CFAIL_TESTS := $(CFAIL_RC ) $(CFAIL_RS )
461465BENCH_TESTS := $(BENCH_RS )
@@ -474,6 +478,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
474478CTEST_MODE_rpass-full = run-pass
475479CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL )
476480
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+
477486CTEST_SRC_BASE_rfail = run-fail
478487CTEST_BUILD_BASE_rfail = run-fail
479488CTEST_MODE_rfail = run-fail
@@ -572,6 +581,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
572581
573582CTEST_DEPS_rpass_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_TESTS )
574583CTEST_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 ) )
575585CTEST_DEPS_rfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RFAIL_TESTS )
576586CTEST_DEPS_cfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_TESTS )
577587CTEST_DEPS_bench_$(1 ) -T-$(2 ) -H-$(3 ) = $$(BENCH_TESTS )
@@ -640,7 +650,7 @@ endif
640650
641651endef
642652
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
644654
645655$(foreach host,$(CFG_HOST), \
646656 $(eval $(foreach target,$(CFG_TARGET), \
@@ -783,6 +793,7 @@ TEST_GROUPS = \
783793 $(foreach crate,$(TEST_DOC_CRATES ) ,doc-crate-$(crate ) ) \
784794 rpass \
785795 rpass-full \
796+ cfail-full \
786797 rfail \
787798 cfail \
788799 bench \
0 commit comments