diff options
| author | bors <bors@rust-lang.org> | 2017-11-13 11:46:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-13 11:46:55 +0000 |
| commit | b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2 (patch) | |
| tree | 60993f81e5c4a7567ae16747951dd74f5915110f /src/test | |
| parent | e312c8a8c3ecd7fead1e8a6cc591360dc73c9e79 (diff) | |
| parent | 7625c79f2a8947388012d0636cac914c47771eff (diff) | |
| download | rust-b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2.tar.gz rust-b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2.zip | |
Auto merge of #45810 - SimonSapin:ac-dc, r=aturon
Disable LLVM assertions on Nightly, enable them in "alt" builds. Per IRC discussion https://mozilla.logbot.info/rust-infra/20171106#c13812170-c13812204 Background: https://internals.rust-lang.org/t/disabling-llvm-assertions-in-nightly-builds/5388/14
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/sanitizer-memory/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make/sanitizer-memory/Makefile index 7502ef0e7a7..f3a896cd4ab 100644 --- a/src/test/run-make/sanitizer-memory/Makefile +++ b/src/test/run-make/sanitizer-memory/Makefile @@ -3,8 +3,10 @@ all: ifeq ($(TARGET),x86_64-unknown-linux-gnu) ifdef SANITIZER_SUPPORT - $(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | grep -q librustc_msan - $(TMPDIR)/uninit 2>&1 | grep -q use-of-uninitialized-value + $(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | tee $(TMPDIR)/out + grep -q librustc_msan $(TMPDIR)/out + $(TMPDIR)/uninit 2>&1 | tee $(TMPDIR)/out + grep -q use-of-uninitialized-value $(TMPDIR)/out endif endif |