Skip to content

Commit cadebc7

Browse files
committed
Disable jemalloc tests on platforms where it is disabled (closes #38612)
See also #37392
1 parent 417953f commit cadebc7

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ extern crate allocator_dylib2;
2929
// ensure we get the same error.
3030
//
3131
// So long as we CI linux/OSX we should be good.
32-
#[cfg(any(target_os = "linux", target_os = "macos"))]
32+
#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
33+
target_os = "macos"))]
3334
extern crate alloc_system;
34-
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
35+
#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
36+
target_os = "macos")))]
3537
extern crate allocator1;
3638

3739
fn main() {

src/test/run-pass/allocator-default.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
#![feature(alloc_jemalloc)]
1212

13-
#[cfg(any(target_os = "linux", target_os = "macos"))]
13+
#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
14+
target_os = "macos"))]
1415
extern crate alloc_jemalloc;
1516

1617
fn main() {

0 commit comments

Comments
 (0)