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.
This commit is contained in:
bors 2015-08-18 23:20:52 +00:00
commit 4c1daeb7ad
3 changed files with 3 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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)