Skip to content

Commit 445988b

Browse files
committed
auto merge of #13832 : alexcrichton/rust/cfail-full, r=brson
Compile-fail tests for syntax extensions belong in this suite which has correct dependencies on all artifacts rather than just the target artifacts. Closes #13818
2 parents f83cf6c + 7b2a89f commit 445988b

10 files changed

+13
-1
lines changed

configure

+1
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@ do
803803
make_dir $h/test/run-pass-fulldeps
804804
make_dir $h/test/run-fail
805805
make_dir $h/test/compile-fail
806+
make_dir $h/test/compile-fail-fulldeps
806807
make_dir $h/test/bench
807808
make_dir $h/test/perf
808809
make_dir $h/test/pretty

mk/tests.mk

+12-1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
288288
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
289289
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
290290
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
291+
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
291292
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
292293
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
293294
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
@@ -451,6 +452,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
451452
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
452453
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
453454
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)
454457
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
455458
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
456459
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
@@ -467,6 +470,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
467470

468471
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
469472
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
473+
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
470474
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
471475
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
472476
BENCH_TESTS := $(BENCH_RS)
@@ -485,6 +489,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
485489
CTEST_MODE_rpass-full = run-pass
486490
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
487491

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+
488497
CTEST_SRC_BASE_rfail = run-fail
489498
CTEST_BUILD_BASE_rfail = run-fail
490499
CTEST_MODE_rfail = run-fail
@@ -583,6 +592,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
583592

584593
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
585594
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))
586596
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
587597
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
588598
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
@@ -651,7 +661,7 @@ endif
651661

652662
endef
653663

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
655665

656666
$(foreach host,$(CFG_HOST), \
657667
$(eval $(foreach target,$(CFG_TARGET), \
@@ -794,6 +804,7 @@ TEST_GROUPS = \
794804
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
795805
rpass \
796806
rpass-full \
807+
cfail-full \
797808
rfail \
798809
cfail \
799810
bench \

0 commit comments

Comments
 (0)