mirror of
https://github.com/rust-lang/rust.git
synced 2024-10-31 06:22:00 +00:00
Auto merge of #28383 - semarie:openbsd-jemalloc, r=alexcrichton
ignore severals tests under openbsd as we have disabling jemalloc under this target. r? @alexcrichton
This commit is contained in:
commit
341a91902a
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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() {
|
||||
|
@ -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)]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user