Skip to content

Commit

Permalink
Disable jemalloc tests on platforms where it is disabled (closes rust…
Browse files Browse the repository at this point in the history
  • Loading branch information
infinity0 committed Jan 12, 2017
1 parent 417953f commit cadebc7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-pass/allocator-default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit cadebc7

Please sign in to comment.