Skip to content

test: Add a compile-fail-fulldeps test suite #13832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexcrichton wants to merge 1 commit into from
Closed

test: Add a compile-fail-fulldeps test suite #13832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ do
make_dir $h/test/run-pass-fulldeps
make_dir $h/test/run-fail
make_dir $h/test/compile-fail
make_dir $h/test/compile-fail-fulldeps
make_dir $h/test/bench
make_dir $h/test/perf
make_dir $h/test/pretty
Expand Down
13 changes: 12 additions & 1 deletion mk/tests.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
Expand Down Expand Up @@ -440,6 +441,8 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
Expand All @@ -456,6 +459,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)

RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
BENCH_TESTS := $(BENCH_RS)
Expand All @@ -474,6 +478,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
CTEST_MODE_rpass-full = run-pass
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)

CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
CTEST_MODE_cfail-full = compile-fail
CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)

CTEST_SRC_BASE_rfail = run-fail
CTEST_BUILD_BASE_rfail = run-fail
CTEST_MODE_rfail = run-fail
Expand Down Expand Up @@ -572,6 +581,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \

CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
Expand Down Expand Up @@ -640,7 +650,7 @@ endif

endef

CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo codegen

$(foreach host,$(CFG_HOST), \
$(eval $(foreach target,$(CFG_TARGET), \
Expand Down Expand Up @@ -783,6 +793,7 @@ TEST_GROUPS = \
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
rpass \
rpass-full \
cfail-full \
rfail \
cfail \
bench \
Expand Down
0 ...e-fail/syntax-extension-fourcc-bad-len.rs → ...lldeps/syntax-extension-fourcc-bad-len.rs
View file
Open in desktop
File renamed without changes.
0 ...syntax-extension-fourcc-invalid-endian.rs → ...syntax-extension-fourcc-invalid-endian.rs
View file
Open in desktop
File renamed without changes.
0 .../syntax-extension-fourcc-non-ascii-str.rs → .../syntax-extension-fourcc-non-ascii-str.rs
View file
Open in desktop
File renamed without changes.
0 ...il/syntax-extension-fourcc-non-literal.rs → ...ps/syntax-extension-fourcc-non-literal.rs
View file
Open in desktop
File renamed without changes.
0 ...x-extension-fourcc-unsupported-literal.rs → ...x-extension-fourcc-unsupported-literal.rs
View file
Open in desktop
File renamed without changes.
0 ...ail/syntax-extension-hexfloat-bad-lits.rs → ...eps/syntax-extension-hexfloat-bad-lits.rs
View file
Open in desktop
File renamed without changes.
0 ...il/syntax-extension-hexfloat-bad-types.rs → ...ps/syntax-extension-hexfloat-bad-types.rs
View file
Open in desktop
File renamed without changes.
0 ...le-fail/syntax-extension-regex-invalid.rs → ...ulldeps/syntax-extension-regex-invalid.rs
View file
Open in desktop
File renamed without changes.