From e5e4744766aee3767749e01c621d299315ee56b0 Mon Sep 17 00:00:00 2001 From: Dave Huseby Date: Thu, 3 Sep 2015 07:25:21 -0700 Subject: [PATCH] Fixes #27886 -- bitrig does not use jemalloc (yet) --- src/test/compile-fail/allocator-dylib-is-system.rs | 1 + src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 1 + src/test/run-pass/allocator-default.rs | 4 ++-- src/test/run-pass/allocator-jemalloc.rs | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index 6c21f77c9a669..35bfc0c7d4fa5 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -10,6 +10,7 @@ // ignore-msvc everything is the system allocator on msvc // ignore-musl no dylibs on musl yet +// ignore-bitrig no jemalloc on bitrig // aux-build:allocator-dylib.rs // no-prefer-dynamic // error-pattern: cannot link together two allocators 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 8ba48f6a52530..23f9efa2e6446 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -10,6 +10,7 @@ // ignore-msvc everything is the system allocator on msvc // ignore-musl no dylibs on musl right now +// ignore-bitrig no jemalloc on bitrig // aux-build:allocator-dylib2.rs // error-pattern: cannot link together two allocators diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 1bca39de6635d..1dbdc5e4a5004 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -10,9 +10,9 @@ #![feature(alloc_jemalloc, alloc_system)] -#[cfg(not(target_env = "msvc"))] +#[cfg(not(any(target_env = "msvc", target_os = "bitrig")))] extern crate alloc_jemalloc; -#[cfg(target_env = "msvc")] +#[cfg(any(target_env = "msvc", target_os = "bitrig"))] extern crate alloc_system; fn main() { diff --git a/src/test/run-pass/allocator-jemalloc.rs b/src/test/run-pass/allocator-jemalloc.rs index 77fa64ec3db07..780c5e5884fae 100644 --- a/src/test/run-pass/allocator-jemalloc.rs +++ b/src/test/run-pass/allocator-jemalloc.rs @@ -10,6 +10,7 @@ // no-prefer-dynamic // ignore-msvc no jemalloc on msvc +// ignore-bitrig no jemalloc on bitrig either #![feature(alloc_jemalloc)]