about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/test/compile-fail/allocator-dylib-is-system.rs1
-rw-r--r--src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs1
-rw-r--r--src/test/run-pass/allocator-default.rs4
-rw-r--r--src/test/run-pass/allocator-jemalloc.rs3
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)]