Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Prefix PROFILER_SUPPORT and SANITIZER_SUPPORT test env vars with RUST…
…C_ to make things clearer.
  • Loading branch information
michaelwoerister committed Apr 18, 2019
1 parent 553ec5d commit 4269be3
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/test.rs
Expand Up @@ -1268,11 +1268,11 @@ impl Step for Compiletest {
builder.add_rust_test_threads(&mut cmd);

if builder.config.sanitizers {
cmd.env("SANITIZER_SUPPORT", "1");
cmd.env("RUSTC_SANITIZER_SUPPORT", "1");
}

if builder.config.profiler {
cmd.env("PROFILER_SUPPORT", "1");
cmd.env("RUSTC_PROFILER_SUPPORT", "1");
}

cmd.env("RUST_TEST_TMPDIR", builder.out.join("tmp"));
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/pgo-gen-lto/Makefile
@@ -1,7 +1,7 @@
-include ../tools.mk

all:
ifeq ($(PROFILER_SUPPORT),1)
ifeq ($(RUSTC_PROFILER_SUPPORT),1)
$(RUSTC) -Copt-level=3 -Clto=fat -Z pgo-gen="$(TMPDIR)" test.rs
$(call RUN,test) || exit 1
[ -e "$(TMPDIR)"/default_*.profraw ] || (echo "No .profraw file"; exit 1)
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile
@@ -1,7 +1,7 @@
-include ../tools.mk

all:
ifeq ($(PROFILER_SUPPORT),1)
ifeq ($(RUSTC_PROFILER_SUPPORT),1)
$(RUSTC) -O -Ccodegen-units=1 -Z pgo-gen="$(TMPDIR)" --emit=llvm-ir test.rs
# We expect symbols starting with "__llvm_profile_".
$(CGREP) "__llvm_profile_" < $(TMPDIR)/test.ll
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/pgo-gen/Makefile
@@ -1,7 +1,7 @@
-include ../tools.mk

all:
ifeq ($(PROFILER_SUPPORT),1)
ifeq ($(RUSTC_PROFILER_SUPPORT),1)
$(RUSTC) -g -Z pgo-gen="$(TMPDIR)" test.rs
$(call RUN,test) || exit 1
[ -e "$(TMPDIR)"/default_*.profraw ] || (echo "No .profraw file"; exit 1)
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/profile/Makefile
@@ -1,7 +1,7 @@
-include ../tools.mk

all:
ifeq ($(PROFILER_SUPPORT),1)
ifeq ($(RUSTC_PROFILER_SUPPORT),1)
$(RUSTC) -g -Z profile test.rs
$(call RUN,test) || exit 1
[ -e "$(TMPDIR)/test.gcno" ] || (echo "No .gcno file"; exit 1)
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-make-fulldeps/sanitizer-address/Makefile
Expand Up @@ -5,11 +5,11 @@ LOG := $(TMPDIR)/log.txt
# NOTE the address sanitizer only supports x86_64 linux and macOS

ifeq ($(TARGET),x86_64-apple-darwin)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)
EXTRA_RUSTFLAG=-C rpath
else
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)

# Apparently there are very specific Linux kernels, notably the one that's
# currently on Travis CI, which contain a buggy commit that triggers failures in
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
Expand Up @@ -8,7 +8,7 @@ LOG := $(TMPDIR)/log.txt
# is correctly detected.

ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)

# See comment in sanitizer-address/Makefile for why this is here
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
Expand Up @@ -8,7 +8,7 @@ LOG := $(TMPDIR)/log.txt
# is correctly detected.

ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)

# See comment in sanitizer-address/Makefile for why this is here
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
Expand Down
Expand Up @@ -3,11 +3,11 @@
# NOTE the address sanitizer only supports x86_64 linux and macOS

ifeq ($(TARGET),x86_64-apple-darwin)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)
EXTRA_RUSTFLAG=-C rpath
else
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)
EXTRA_RUSTFLAG=
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/sanitizer-leak/Makefile
Expand Up @@ -6,7 +6,7 @@
# FIXME(#46126) ThinLTO for libstd broke this test

all:
ifdef SANITIZER_SUPPORT
ifdef RUSTC_SANITIZER_SUPPORT
$(RUSTC) -C opt-level=1 -g -Z sanitizer=leak -Z print-link-args leak.rs | $(CGREP) librustc_lsan
$(TMPDIR)/leak 2>&1 | $(CGREP) 'detected memory leaks'
endif
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/sanitizer-memory/Makefile
Expand Up @@ -4,7 +4,7 @@
# only-x86_64

all:
ifdef SANITIZER_SUPPORT
ifdef RUSTC_SANITIZER_SUPPORT
$(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | $(CGREP) librustc_msan
$(TMPDIR)/uninit 2>&1 | $(CGREP) use-of-uninitialized-value
endif
4 changes: 2 additions & 2 deletions src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
@@ -1,11 +1,11 @@
-include ../tools.mk

# This test builds a staticlib, then an executable that links to it.
# The staticlib and executable both are compiled with address sanitizer,
# The staticlib and executable both are compiled with address sanitizer,
# and we assert that a fault in the staticlib is correctly detected.

ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ASAN_SUPPORT=$(SANITIZER_SUPPORT)
ASAN_SUPPORT=$(RUSTC_SANITIZER_SUPPORT)
EXTRA_RUSTFLAG=
endif

Expand Down

0 comments on commit 4269be3

Please sign in to comment.