mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 08:37:14 +00:00
Auto merge of #24835 - rprichard:rfail-full, r=alexcrichton
This commit gets `make check-stage1` working again after #24718. cc @tamird r? @alexcrichton
This commit is contained in:
commit
da2276e293
1
configure
vendored
1
configure
vendored
|
@ -1144,6 +1144,7 @@ do
|
||||||
make_dir $h/test/run-pass-valgrind
|
make_dir $h/test/run-pass-valgrind
|
||||||
make_dir $h/test/run-pass-fulldeps
|
make_dir $h/test/run-pass-fulldeps
|
||||||
make_dir $h/test/run-fail
|
make_dir $h/test/run-fail
|
||||||
|
make_dir $h/test/run-fail-fulldeps
|
||||||
make_dir $h/test/compile-fail
|
make_dir $h/test/compile-fail
|
||||||
make_dir $h/test/parse-fail
|
make_dir $h/test/parse-fail
|
||||||
make_dir $h/test/compile-fail-fulldeps
|
make_dir $h/test/compile-fail-fulldeps
|
||||||
|
|
20
mk/tests.mk
20
mk/tests.mk
|
@ -304,6 +304,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
|
||||||
|
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-cfail-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)-rmake-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
|
||||||
|
@ -345,6 +346,7 @@ check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-valgrind-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-valgrind-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \
|
||||||
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-full-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \
|
||||||
check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec
|
||||||
|
|
||||||
|
@ -464,6 +466,7 @@ $(foreach host,$(CFG_HOST), \
|
||||||
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
|
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
|
||||||
RPASS_VALGRIND_RS := $(wildcard $(S)src/test/run-pass-valgrind/*.rs)
|
RPASS_VALGRIND_RS := $(wildcard $(S)src/test/run-pass-valgrind/*.rs)
|
||||||
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
|
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
|
||||||
|
RFAIL_FULL_RS := $(wildcard $(S)src/test/run-fail-fulldeps/*.rs)
|
||||||
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
|
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
|
||||||
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
|
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
|
||||||
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
|
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
|
||||||
|
@ -483,6 +486,7 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
|
||||||
RPASS_TESTS := $(RPASS_RS)
|
RPASS_TESTS := $(RPASS_RS)
|
||||||
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
|
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
|
||||||
RPASS_FULL_TESTS := $(RPASS_FULL_RS)
|
RPASS_FULL_TESTS := $(RPASS_FULL_RS)
|
||||||
|
RFAIL_FULL_TESTS := $(RFAIL_FULL_RS)
|
||||||
CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
|
CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
|
||||||
RFAIL_TESTS := $(RFAIL_RS)
|
RFAIL_TESTS := $(RFAIL_RS)
|
||||||
CFAIL_TESTS := $(CFAIL_RS)
|
CFAIL_TESTS := $(CFAIL_RS)
|
||||||
|
@ -510,6 +514,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
|
||||||
CTEST_MODE_rpass-full = run-pass
|
CTEST_MODE_rpass-full = run-pass
|
||||||
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
|
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
|
||||||
|
|
||||||
|
CTEST_SRC_BASE_rfail-full = run-fail-fulldeps
|
||||||
|
CTEST_BUILD_BASE_rfail-full = run-fail-fulldeps
|
||||||
|
CTEST_MODE_rfail-full = run-fail
|
||||||
|
CTEST_RUNTOOL_rfail-full = $(CTEST_RUNTOOL)
|
||||||
|
|
||||||
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
|
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
|
||||||
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
|
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
|
||||||
CTEST_MODE_cfail-full = compile-fail
|
CTEST_MODE_cfail-full = compile-fail
|
||||||
|
@ -661,6 +670,7 @@ endif
|
||||||
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
|
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
|
||||||
CTEST_DEPS_rpass-valgrind_$(1)-T-$(2)-H-$(3) = $$(RPASS_VALGRIND_TESTS)
|
CTEST_DEPS_rpass-valgrind_$(1)-T-$(2)-H-$(3) = $$(RPASS_VALGRIND_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_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
|
||||||
|
CTEST_DEPS_rfail-full_$(1)-T-$(2)-H-$(3) = $$(RFAIL_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_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_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
|
||||||
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
|
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
|
||||||
|
@ -737,7 +747,7 @@ endif
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
CTEST_NAMES = rpass rpass-valgrind rpass-full cfail-full rfail cfail pfail \
|
CTEST_NAMES = rpass rpass-valgrind rpass-full rfail-full cfail-full rfail cfail pfail \
|
||||||
bench perf debuginfo-gdb debuginfo-lldb codegen rustdocck
|
bench perf debuginfo-gdb debuginfo-lldb codegen rustdocck
|
||||||
|
|
||||||
$(foreach host,$(CFG_HOST), \
|
$(foreach host,$(CFG_HOST), \
|
||||||
|
@ -746,22 +756,26 @@ $(foreach host,$(CFG_HOST), \
|
||||||
$(eval $(foreach name,$(CTEST_NAMES), \
|
$(eval $(foreach name,$(CTEST_NAMES), \
|
||||||
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
|
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
|
||||||
|
|
||||||
PRETTY_NAMES = pretty-rpass pretty-rpass-valgrind pretty-rpass-full pretty-rfail pretty-bench pretty-pretty
|
PRETTY_NAMES = pretty-rpass pretty-rpass-valgrind pretty-rpass-full pretty-rfail-full pretty-rfail \
|
||||||
|
pretty-bench pretty-pretty
|
||||||
PRETTY_DEPS_pretty-rpass = $(RPASS_TESTS)
|
PRETTY_DEPS_pretty-rpass = $(RPASS_TESTS)
|
||||||
PRETTY_DEPS_pretty-rpass-valgrind = $(RPASS_VALGRIND_TESTS)
|
PRETTY_DEPS_pretty-rpass-valgrind = $(RPASS_VALGRIND_TESTS)
|
||||||
PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS)
|
PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS)
|
||||||
|
PRETTY_DEPS_pretty-rfail-full = $(RFAIL_FULL_TESTS)
|
||||||
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
|
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
|
||||||
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
|
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
|
||||||
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
|
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
|
||||||
PRETTY_DIRNAME_pretty-rpass = run-pass
|
PRETTY_DIRNAME_pretty-rpass = run-pass
|
||||||
PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
|
PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
|
||||||
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
|
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
|
||||||
|
PRETTY_DIRNAME_pretty-rfail-full = run-fail-fulldeps
|
||||||
PRETTY_DIRNAME_pretty-rfail = run-fail
|
PRETTY_DIRNAME_pretty-rfail = run-fail
|
||||||
PRETTY_DIRNAME_pretty-bench = bench
|
PRETTY_DIRNAME_pretty-bench = bench
|
||||||
PRETTY_DIRNAME_pretty-pretty = pretty
|
PRETTY_DIRNAME_pretty-pretty = pretty
|
||||||
|
|
||||||
define DEF_PRETTY_FULLDEPS
|
define DEF_PRETTY_FULLDEPS
|
||||||
PRETTY_DEPS$(1)_T_$(2)_H_$(3)_pretty-rpass-full = $$(CSREQ$(1)_T_$(3)_H_$(3))
|
PRETTY_DEPS$(1)_T_$(2)_H_$(3)_pretty-rpass-full = $$(CSREQ$(1)_T_$(3)_H_$(3))
|
||||||
|
PRETTY_DEPS$(1)_T_$(2)_H_$(3)_pretty-rfail-full = $$(CSREQ$(1)_T_$(3)_H_$(3))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(foreach host,$(CFG_HOST), \
|
$(foreach host,$(CFG_HOST), \
|
||||||
|
@ -901,6 +915,7 @@ TEST_GROUPS = \
|
||||||
rpass \
|
rpass \
|
||||||
rpass-valgrind \
|
rpass-valgrind \
|
||||||
rpass-full \
|
rpass-full \
|
||||||
|
rfail-full \
|
||||||
cfail-full \
|
cfail-full \
|
||||||
rfail \
|
rfail \
|
||||||
cfail \
|
cfail \
|
||||||
|
@ -918,6 +933,7 @@ TEST_GROUPS = \
|
||||||
pretty-rpass \
|
pretty-rpass \
|
||||||
pretty-rpass-valgrind \
|
pretty-rpass-valgrind \
|
||||||
pretty-rpass-full \
|
pretty-rpass-full \
|
||||||
|
pretty-rfail-full \
|
||||||
pretty-rfail \
|
pretty-rfail \
|
||||||
pretty-bench \
|
pretty-bench \
|
||||||
pretty-pretty \
|
pretty-pretty \
|
||||||
|
|
Loading…
Reference in a new issue