Skip to content

Commit fea0742

Browse files
committed
Rollup merge of rust-lang#28193 - dhuseby:fixing_bitrig_alloc_crate_tests, r=alexcrichton
@alexcrichton this will get the bitrig buildbot back to green.
2 parents 7fe48dc + e5e4744 commit fea0742

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-msvc everything is the system allocator on msvc
1212
// ignore-musl no dylibs on musl yet
13+
// ignore-bitrig no jemalloc on bitrig
1314
// aux-build:allocator-dylib.rs
1415
// no-prefer-dynamic
1516
// error-pattern: cannot link together two allocators

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-msvc everything is the system allocator on msvc
1212
// ignore-musl no dylibs on musl right now
13+
// ignore-bitrig no jemalloc on bitrig
1314
// aux-build:allocator-dylib2.rs
1415
// error-pattern: cannot link together two allocators
1516

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

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

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

1818
fn main() {

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// no-prefer-dynamic
1212
// ignore-msvc no jemalloc on msvc
13+
// ignore-bitrig no jemalloc on bitrig either
1314

1415
#![feature(alloc_jemalloc)]
1516

0 commit comments

Comments
 (0)