From 872a0ebf2170c8b3e8ac665c41270e83cb9105ce Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 15 Feb 2017 17:00:41 -0500 Subject: [PATCH 1/2] cleanup: remove the *san Cargo features from std these belong to a previous iteration of the sanitizer implementation --- src/bootstrap/lib.rs | 2 +- src/libstd/Cargo.toml | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 98b68d870d375..071d0b0b09009 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -613,7 +613,7 @@ impl Build { /// Get the space-separated set of activated features for the standard /// library. fn std_features(&self) -> String { - let mut features = "panic-unwind asan lsan msan tsan".to_string(); + let mut features = "panic-unwind".to_string(); if self.config.debug_jemalloc { features.push_str(" debug-jemalloc"); diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 2ba7517d3d202..46511452a7237 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -24,22 +24,18 @@ std_unicode = { path = "../libstd_unicode" } unwind = { path = "../libunwind" } [target.x86_64-unknown-linux-gnu.dependencies] -rustc_asan = { path = "../librustc_asan", optional = true } -rustc_lsan = { path = "../librustc_lsan", optional = true } -rustc_msan = { path = "../librustc_msan", optional = true } -rustc_tsan = { path = "../librustc_tsan", optional = true } +rustc_asan = { path = "../librustc_asan" } +rustc_lsan = { path = "../librustc_lsan" } +rustc_msan = { path = "../librustc_msan" } +rustc_tsan = { path = "../librustc_tsan" } [build-dependencies] build_helper = { path = "../build_helper" } gcc = "0.3.27" [features] -asan = ["rustc_asan"] backtrace = [] debug-jemalloc = ["alloc_jemalloc/debug"] jemalloc = ["alloc_jemalloc"] force_alloc_system = [] -lsan = ["rustc_lsan"] -msan = ["rustc_msan"] panic-unwind = ["panic_unwind"] -tsan = ["rustc_tsan"] From 28baa27570a80f7e8e248bf8ca1dbbea6cd1ecba Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 21 Feb 2017 22:05:19 -0500 Subject: [PATCH 2/2] sanitizer runtime crates shouldn't be tested --- src/librustc_asan/Cargo.toml | 1 + src/librustc_lsan/Cargo.toml | 1 + src/librustc_msan/Cargo.toml | 1 + src/librustc_tsan/Cargo.toml | 1 + 4 files changed, 4 insertions(+) diff --git a/src/librustc_asan/Cargo.toml b/src/librustc_asan/Cargo.toml index 2d4872b1fc942..0fda2805feac8 100644 --- a/src/librustc_asan/Cargo.toml +++ b/src/librustc_asan/Cargo.toml @@ -7,6 +7,7 @@ version = "0.0.0" [lib] name = "rustc_asan" path = "lib.rs" +test = false [build-dependencies] build_helper = { path = "../build_helper" } diff --git a/src/librustc_lsan/Cargo.toml b/src/librustc_lsan/Cargo.toml index bc1f2ead76884..786883d21350b 100644 --- a/src/librustc_lsan/Cargo.toml +++ b/src/librustc_lsan/Cargo.toml @@ -7,6 +7,7 @@ version = "0.0.0" [lib] name = "rustc_lsan" path = "lib.rs" +test = false [build-dependencies] build_helper = { path = "../build_helper" } diff --git a/src/librustc_msan/Cargo.toml b/src/librustc_msan/Cargo.toml index 45cc6b9839fb8..b3b70bc0a25ef 100644 --- a/src/librustc_msan/Cargo.toml +++ b/src/librustc_msan/Cargo.toml @@ -7,6 +7,7 @@ version = "0.0.0" [lib] name = "rustc_msan" path = "lib.rs" +test = false [build-dependencies] build_helper = { path = "../build_helper" } diff --git a/src/librustc_tsan/Cargo.toml b/src/librustc_tsan/Cargo.toml index 66d6236361ea2..97c1181e3a220 100644 --- a/src/librustc_tsan/Cargo.toml +++ b/src/librustc_tsan/Cargo.toml @@ -7,6 +7,7 @@ version = "0.0.0" [lib] name = "rustc_tsan" path = "lib.rs" +test = false [build-dependencies] build_helper = { path = "../build_helper" }