user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable jemalloc tests on platforms where it is disabled (closes #38612)

Browse source 
See also #37392
This commit is contained in:
Ximin Luo 2017-01-12 21:10:31 +01:00
parent 417953f238
commit cadebc7571
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
View file

@ -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() {

3
src/test/run-pass/allocator-default.rs
View file

@ -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() {