diff options
| author | bors <bors@rust-lang.org> | 2021-02-05 06:12:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-05 06:12:26 +0000 |
| commit | 9e5d58fb420a487ae30f38141eccdc8d79fb8d58 (patch) | |
| tree | 841e0654fc71d614351d57ce4ef7842772335534 /src/test/run-make-fulldeps/coverage-spanview | |
| parent | 6a388dcfbb07b3ca3d4ad3fd3902ac7e3b11b5f6 (diff) | |
| parent | 5ce67106688664eb1bfd8abae129e7c548de0351 (diff) | |
Auto merge of #81688 - pnkfelix:fix-llvm-version-check-in-run-make-tests, r=simulacrum
Use `# min-llvm-version: 11.0` to force a minimum LLVM version Use `# min-llvm-version: 11.0` to force a minimum LLVM version, rather than ad-hoc internal solution. In particular: the specific code to define LLVM_VERSION_11_PLUS here was, for some reason, using `$(shell ...)` with bash-specific variable replacement code. On non-bash platforms like dash, that `shell` invocation would fail, and the LLVM_VERSION_11_PLUS check would always fail, the test would always be ignored, and thus be treated as a "success" (in the sense that `--bless` would never do anything). * Note in particular that GNU Make treats the SHELL variable as a very special case: it does not inherit the value of SHELL from the user's environment. Except on Windows. See more explanation in the [GNU Make docs](https://www.gnu.org/software/make/manual/html_node/Choosing-the-Shell.html). * The effect of this is that these tests end up using `/bin/sh` (except on Windows) for their `$(shell ...)` invocations, and thus we see differing behaviors depending on whether your `/bin/sh` links to `/bin/dash` or to `/bin/bash`. This was causing me a lot of pain.
Diffstat (limited to 'src/test/run-make-fulldeps/coverage-spanview')
| -rw-r--r-- | src/test/run-make-fulldeps/coverage-spanview/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
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 |