diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-14 10:07:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 10:07:34 -0500 |
| commit | 8d17ef146bb2b4757bcfcbda72dd494ff2867677 (patch) | |
| tree | ef05dd51f09ba9c073276eda51b8377e9cbb9cad /src | |
| parent | 32b8f4ec98dc77b1f5611478228c446d5faba7e5 (diff) | |
| parent | 30abe7bd583d172414d82357acf62ceabf896730 (diff) | |
| download | rust-8d17ef146bb2b4757bcfcbda72dd494ff2867677.tar.gz rust-8d17ef146bb2b4757bcfcbda72dd494ff2867677.zip | |
Rollup merge of #39785 - alexcrichton:no-thread-sanitizer, r=japaric
test: Remove sanitizer-thread test Unfortunately it appears to spuriously fail so we can't gate on it
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-make/sanitizer-thread/Makefile | 10 | ||||
| -rw-r--r-- | src/test/run-make/sanitizer-thread/racy.rs | 21 |
2 files changed, 0 insertions, 31 deletions
diff --git a/src/test/run-make/sanitizer-thread/Makefile b/src/test/run-make/sanitizer-thread/Makefile deleted file mode 100644 index 8bb89a241cb..00000000000 --- a/src/test/run-make/sanitizer-thread/Makefile +++ /dev/null @@ -1,10 +0,0 @@ --include ../tools.mk - -ifdef SANITIZER_SUPPORT -all: - $(RUSTC) -g -Z sanitizer=thread -Z print-link-args racy.rs | grep -q librustc_tsan - $(TMPDIR)/racy 2>&1 | grep -q 'data race' -else -all: - -endif diff --git a/src/test/run-make/sanitizer-thread/racy.rs b/src/test/run-make/sanitizer-thread/racy.rs deleted file mode 100644 index dc929e004a4..00000000000 --- a/src/test/run-make/sanitizer-thread/racy.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -use std::thread; - -static mut ANSWER: i32 = 0; - -fn main() { - let t1 = thread::spawn(|| unsafe { ANSWER = 42 }); - unsafe { - ANSWER = 24; - } - t1.join().ok(); -} |
