diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-09-03 23:30:38 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-09-04 01:40:03 +0530 |
| commit | 75ca401f2df6d582bba38d3477fdd1b811c8a41c (patch) | |
| tree | d9c6677dc91e8158b5b36f97354566764b2dc90a /src | |
| parent | 3c4d6d626f4fe9736568e784510470c3c82a10e6 (diff) | |
| parent | e5e4744766aee3767749e01c621d299315ee56b0 (diff) | |
| download | rust-75ca401f2df6d582bba38d3477fdd1b811c8a41c.tar.gz rust-75ca401f2df6d582bba38d3477fdd1b811c8a41c.zip | |
Rollup merge of #28193 - dhuseby:fixing_bitrig_alloc_crate_tests, r=alexcrichton
@alexcrichton this will get the bitrig buildbot back to green.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/compile-fail/allocator-dylib-is-system.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 4 | ||||
| -rw-r--r-- | 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 6c21f77c9a6..35bfc0c7d4f 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 8ba48f6a525..23f9efa2e64 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 1bca39de663..1dbdc5e4a50 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 77fa64ec3db..780c5e5884f 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)] |