diff options
| author | Ximin Luo <infinity0@pwned.gg> | 2017-01-12 21:10:31 +0100 |
|---|---|---|
| committer | Ximin Luo <infinity0@pwned.gg> | 2017-01-12 21:10:31 +0100 |
| commit | cadebc7571074e4c17cef267d7269e91fd12ccf8 (patch) | |
| tree | 273b00e46c6e07ddaa97de376aa424844192679b | |
| parent | 417953f2386c79f043c345c4db43ce5e06455219 (diff) | |
Disable jemalloc tests on platforms where it is disabled (closes #38612)
See also #37392
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs index 02c271ab24d..5d566c0e0b4 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -29,9 +29,11 @@ extern crate allocator_dylib2; // ensure we get the same error. // // So long as we CI linux/OSX we should be good. -#[cfg(any(target_os = "linux", target_os = "macos"))] +#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")), + target_os = "macos"))] extern crate alloc_system; -#[cfg(not(any(target_os = "linux", target_os = "macos")))] +#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")), + target_os = "macos")))] extern crate allocator1; fn main() { diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 32ed2b33011..0a02e8072b9 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -10,7 +10,8 @@ #![feature(alloc_jemalloc)] -#[cfg(any(target_os = "linux", target_os = "macos"))] +#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")), + target_os = "macos"))] extern crate alloc_jemalloc; fn main() { |