diff options
| author | bors <bors@rust-lang.org> | 2015-08-18 23:20:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-18 23:20:52 +0000 |
| commit | 4c1daeb7adc200f9dda17de78bdc599644910c4b (patch) | |
| tree | 38deedaa82d9c5f03a328ce57119d28736fae600 | |
| parent | 2fb3fb24a395dfb21142f4572440214fbf551e4a (diff) | |
| parent | cc65f79e55e152b6e1bba704d1e2c7ed789da244 (diff) | |
| download | rust-4c1daeb7adc200f9dda17de78bdc599644910c4b.tar.gz rust-4c1daeb7adc200f9dda17de78bdc599644910c4b.zip | |
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.
| -rw-r--r-- | src/test/compile-fail/allocator-dylib-is-system.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/two-allocators-3.rs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index 8fad2af42b9..6c21f77c9a6 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -9,6 +9,7 @@ // except according to those terms. // ignore-msvc everything is the system allocator on msvc +// ignore-musl no dylibs on musl yet // 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 224d9379ee1..8ba48f6a525 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -9,6 +9,7 @@ // except according to those terms. // ignore-msvc everything is the system allocator on msvc +// ignore-musl no dylibs on musl right now // aux-build:allocator-dylib2.rs // error-pattern: cannot link together two allocators diff --git a/src/test/compile-fail/two-allocators-3.rs b/src/test/compile-fail/two-allocators-3.rs index 70c9dfcafae..7782d0e338e 100644 --- a/src/test/compile-fail/two-allocators-3.rs +++ b/src/test/compile-fail/two-allocators-3.rs @@ -10,6 +10,7 @@ // aux-build:allocator1.rs // error-pattern: cannot link together two allocators +// ignore-musl no dylibs on musl yet // We're linking std dynamically (via -C prefer-dynamic for this test) which // has an allocator and then we're also linking in a new allocator (allocator1) |