Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/test/compile-fail/allocator-dylib-is-system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// ignore-msvc everything is the system allocator on msvc
// ignore-musl no dylibs on musl yet
// ignore-bitrig no jemalloc on bitrig
// aux-build:allocator-dylib.rs
// no-prefer-dynamic
// error-pattern: cannot link together two allocators
Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

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

Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass/allocator-default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#![feature(alloc_jemalloc, alloc_system)]

#[cfg(not(target_env = "msvc"))]
#[cfg(not(any(target_env = "msvc", target_os = "bitrig")))]
extern crate alloc_jemalloc;
#[cfg(target_env = "msvc")]
#[cfg(any(target_env = "msvc", target_os = "bitrig"))]
extern crate alloc_system;

fn main() {
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/allocator-jemalloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// no-prefer-dynamic
// ignore-msvc no jemalloc on msvc
// ignore-bitrig no jemalloc on bitrig either

#![feature(alloc_jemalloc)]

Expand Down