diff options
4 files changed, 4 insertions, 22 deletions
diff --git a/src/test/run-make-fulldeps/coverage-llvmir/Makefile b/src/test/run-make-fulldeps/coverage-llvmir/Makefile index 54fc3d16864..7d9121ee2f8 100644 --- a/src/test/run-make-fulldeps/coverage-llvmir/Makefile +++ b/src/test/run-make-fulldeps/coverage-llvmir/Makefile @@ -1,4 +1,5 @@ # needs-profiler-support +# min-llvm-version: 11.0 -include ../coverage/coverage_tools.mk @@ -48,12 +49,7 @@ else -DINSTR_PROF_ORDERFILE='$(DATA_SECTION_PREFIX)__llvm_orderfile' endif -ifeq ($(LLVM_VERSION_11_PLUS),true) all: test_llvm_ir -else -$(info Rust option `-Z instrument-coverage` requires LLVM 11 or higher. Test skipped.) -all: -endif test_llvm_ir: # Compile the test program with non-experimental coverage instrumentation, and generate LLVM IR diff --git a/src/test/run-make-fulldeps/coverage-reports/Makefile b/src/test/run-make-fulldeps/coverage-reports/Makefile index f98245b4a99..a700cf68cd9 100644 --- a/src/test/run-make-fulldeps/coverage-reports/Makefile +++ b/src/test/run-make-fulldeps/coverage-reports/Makefile @@ -1,5 +1,7 @@ +# ignore-test Broken; accidentally silently ignored on Linux CI; FIXME(#81688) # needs-profiler-support # ignore-windows-gnu +# min-llvm-version: 11.0 # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. @@ -67,12 +69,7 @@ ifdef RUSTC_BLESS_TEST DEBUG_FLAG=--debug endif -ifeq ($(LLVM_VERSION_11_PLUS),true) all: $(patsubst $(SOURCEDIR)/lib/%.rs,%,$(wildcard $(SOURCEDIR)/lib/*.rs)) $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs)) -else -$(info Rust option `-Z instrument-coverage` requires LLVM 11 or higher. Test skipped.) -all: -endif # Ensure there are no `expected` results for tests that may have been removed or renamed .PHONY: clear_expected_if_blessed diff --git a/src/test/run-make-fulldeps/coverage-spanview/Makefile b/src/test/run-make-fulldeps/coverage-spanview/Makefile index 84b5d0e522f..2713e7d52ff 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/Makefile +++ b/src/test/run-make-fulldeps/coverage-spanview/Makefile @@ -1,4 +1,5 @@ # needs-profiler-support +# min-llvm-version: 11.0 -include ../coverage/coverage_tools.mk @@ -20,12 +21,7 @@ For revisions in Pull Requests (PR): endef export SPANVIEW_HEADER -ifeq ($(LLVM_VERSION_11_PLUS),true) all: $(patsubst $(SOURCEDIR)/lib/%.rs,%,$(wildcard $(SOURCEDIR)/lib/*.rs)) $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs)) -else -$(info Rust option `-Z instrument-coverage` requires LLVM 11 or higher. Test skipped.) -all: -endif # Ensure there are no `expected` results for tests that may have been removed or renamed .PHONY: clear_expected_if_blessed diff --git a/src/test/run-make-fulldeps/coverage/coverage_tools.mk b/src/test/run-make-fulldeps/coverage/coverage_tools.mk index 4d340d4b1da..11fd824e527 100644 --- a/src/test/run-make-fulldeps/coverage/coverage_tools.mk +++ b/src/test/run-make-fulldeps/coverage/coverage_tools.mk @@ -14,10 +14,3 @@ # Therefore, `-C link-dead-code` is no longer automatically enabled. UNAME = $(shell uname) - -# Rust option `-Z instrument-coverage` uses LLVM Coverage Mapping Format version 4, -# which requires LLVM 11 or greater. -LLVM_VERSION_11_PLUS := $(shell \ - LLVM_VERSION=$$("$(LLVM_BIN_DIR)"/llvm-config --version) && \ - LLVM_VERSION_MAJOR=$${LLVM_VERSION/.*/} && \ - [ $$LLVM_VERSION_MAJOR -ge 11 ] && echo true || echo false) |