Skip to content

Commit 341a919

Browse files
committed
Auto merge of #28383 - semarie:openbsd-jemalloc, r=alexcrichton
ignore severals tests under openbsd as we have disabling jemalloc under this target. r? @alexcrichton
2 parents 523acd9 + 18ee9d7 commit 341a919

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

src/test/compile-fail/allocator-dylib-is-system.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-msvc everything is the system allocator on msvc
1212
// ignore-musl no dylibs on musl yet
1313
// ignore-bitrig no jemalloc on bitrig
14+
// ignore-openbsd no jemalloc on openbsd
1415
// aux-build:allocator-dylib.rs
1516
// no-prefer-dynamic
1617
// error-pattern: cannot link together two allocators

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-msvc everything is the system allocator on msvc
1212
// ignore-musl no dylibs on musl right now
1313
// ignore-bitrig no jemalloc on bitrig
14+
// ignore-openbsd no jemalloc on openbsd
1415
// aux-build:allocator-dylib2.rs
1516
// error-pattern: cannot link together two allocators
1617

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#![feature(alloc_jemalloc, alloc_system)]
1212

13-
#[cfg(not(any(target_env = "msvc", target_os = "bitrig")))]
13+
#[cfg(not(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd")))]
1414
extern crate alloc_jemalloc;
15-
#[cfg(any(target_env = "msvc", target_os = "bitrig"))]
15+
#[cfg(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd"))]
1616
extern crate alloc_system;
1717

1818
fn main() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
// no-prefer-dynamic
1212
// ignore-msvc no jemalloc on msvc
13-
// ignore-bitrig no jemalloc on bitrig either
13+
// ignore-bitrig no jemalloc on bitrig
14+
// ignore-openbsd no jemalloc on openbsd
1415

1516
#![feature(alloc_jemalloc)]
1617

0 commit comments

Comments
 (0)