Skip to content

Commit 4c1daeb

Browse files
committed
Auto merge of #27850 - alexcrichton:fix-musl, r=brson
Some new allocator tests require dynamic libraries to run the full test, but dylibs aren't currently working on MUSL.
2 parents 2fb3fb2 + cc65f79 commit 4c1daeb

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-msvc everything is the system allocator on msvc
12+
// ignore-musl no dylibs on musl yet
1213
// aux-build:allocator-dylib.rs
1314
// no-prefer-dynamic
1415
// 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
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

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

src/test/compile-fail/two-allocators-3.rs

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

1111
// aux-build:allocator1.rs
1212
// error-pattern: cannot link together two allocators
13+
// ignore-musl no dylibs on musl yet
1314

1415
// We're linking std dynamically (via -C prefer-dynamic for this test) which
1516
// has an allocator and then we're also linking in a new allocator (allocator1)

0 commit comments

Comments
 (0)