diff options
| author | bors <bors@rust-lang.org> | 2015-09-14 03:25:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-14 03:25:25 +0000 |
| commit | 341a91902a9cb030b67a4873aa8f4d93fa488c00 (patch) | |
| tree | 2ecfdb27da628b1154cc3c1c8a46b07d0532b384 /src | |
| parent | 523acd980454992f8cb03840f00c553290447820 (diff) | |
| parent | 18ee9d71d517b8e1795b8ba736fd0b6992c8038d (diff) | |
| download | rust-341a91902a9cb030b67a4873aa8f4d93fa488c00.tar.gz rust-341a91902a9cb030b67a4873aa8f4d93fa488c00.zip | |
Auto merge of #28383 - semarie:openbsd-jemalloc, r=alexcrichton
ignore severals tests under openbsd as we have disabling jemalloc under this target. r? @alexcrichton
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 | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index 35bfc0c7d4f..b862fc1a1f4 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -11,6 +11,7 @@ // ignore-msvc everything is the system allocator on msvc // ignore-musl no dylibs on musl yet // ignore-bitrig no jemalloc on bitrig +// ignore-openbsd no jemalloc on openbsd // 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 23f9efa2e64..e75cb2a75cf 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -11,6 +11,7 @@ // ignore-msvc everything is the system allocator on msvc // ignore-musl no dylibs on musl right now // ignore-bitrig no jemalloc on bitrig +// ignore-openbsd no jemalloc on openbsd // 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 1dbdc5e4a50..52ad8b17093 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(any(target_env = "msvc", target_os = "bitrig")))] +#[cfg(not(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd")))] extern crate alloc_jemalloc; -#[cfg(any(target_env = "msvc", target_os = "bitrig"))] +#[cfg(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd"))] 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 780c5e5884f..c8a9aeb706e 100644 --- a/src/test/run-pass/allocator-jemalloc.rs +++ b/src/test/run-pass/allocator-jemalloc.rs @@ -10,7 +10,8 @@ // no-prefer-dynamic // ignore-msvc no jemalloc on msvc -// ignore-bitrig no jemalloc on bitrig either +// ignore-bitrig no jemalloc on bitrig +// ignore-openbsd no jemalloc on openbsd #![feature(alloc_jemalloc)] |