Some final touches to ensure ./x.py test --stage 0 src/lib* works

2018-05-06 01:02:05 +08:00
parent f24915b67f
commit 02f6a0335f
4 changed files with 5 additions and 2 deletions
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -330,10 +330,10 @@
 // with a rustc without jemalloc.
 // FIXME(#44236) shouldn't need MSVC logic
 #![cfg_attr(all(not(target_env = "msvc"),
-                any(stage0, feature = "force_alloc_system")),
+                any(all(stage0, not(test)), feature = "force_alloc_system")),
            feature(global_allocator))]
 #[cfg(all(not(target_env = "msvc"),
-          any(stage0, feature = "force_alloc_system")))]
+          any(all(stage0, not(test)), feature = "force_alloc_system")))]
 #[global_allocator]
 static ALLOC: alloc_system::System = alloc_system::System;