Test fixes from the rollup

diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs
index 3917857e1af0433ce9d4a65e713cb8fd3a33fa1c..5c1b6cd47910addec9809d2f69af499161be96f7 100644 (file)
--- a/src/libstd/rt/global_heap.rs
+++ b/src/libstd/rt/global_heap.rs
@@ -64,16 +64,16 @@ pub unsafe fn realloc_raw(ptr: *mut u8, size: uint) -> *mut u8 {
     }
 }
 
-// The compiler never calls `exchange_free` on ~ZeroSizeType, so zero-size
-// allocations can point to this `static`. It would be incorrect to use a null
-// pointer, due to enums assuming types like unique pointers are never null.
-static EMPTY: () = ();
-
 /// The allocator for unique pointers without contained managed pointers.
 #[cfg(not(test))]
 #[lang="exchange_malloc"]
 #[inline]
 pub unsafe fn exchange_malloc(size: uint) -> *mut u8 {
+    // The compiler never calls `exchange_free` on ~ZeroSizeType, so zero-size
+    // allocations can point to this `static`. It would be incorrect to use a null
+    // pointer, due to enums assuming types like unique pointers are never null.
+    static EMPTY: () = ();
+
     if size == 0 {
         &EMPTY as *() as *mut u8
     } else {

diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs
index a40899de931c95213c5465f10694006ba697538d..17251d31351ab303b72be6c41091c02391280fba 100644 (file)
--- a/src/libsyntax/abi.rs
+++ b/src/libsyntax/abi.rs
@@ -193,12 +193,12 @@ fn indices_are_correct() {
 
 #[test]
 fn pick_uniplatform() {
-    assert_eq!(Stdcall.for_arch(OsLinux, X86), Some(Stdcall));
-    assert_eq!(Stdcall.for_arch(OsLinux, Arm), None);
-    assert_eq!(System.for_arch(OsLinux, X86), Some(C));
-    assert_eq!(System.for_arch(OsWin32, X86), Some(Stdcall));
-    assert_eq!(System.for_arch(OsWin32, X86_64), Some(C));
-    assert_eq!(System.for_arch(OsWin32, Arm), Some(C));
-    assert_eq!(Stdcall.for_arch(OsWin32, X86), Some(Stdcall));
-    assert_eq!(Stdcall.for_arch(OsWin32, X86_64), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsLinux, X86), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsLinux, Arm), None);
+    assert_eq!(System.for_target(OsLinux, X86), Some(C));
+    assert_eq!(System.for_target(OsWin32, X86), Some(Stdcall));
+    assert_eq!(System.for_target(OsWin32, X86_64), Some(C));
+    assert_eq!(System.for_target(OsWin32, Arm), Some(C));
+    assert_eq!(Stdcall.for_target(OsWin32, X86), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsWin32, X86_64), Some(Stdcall));
 }

diff --git a/src/test/bench/rt-spawn-rate.rs b/src/test/bench/rt-spawn-rate.rs
index 5f445de069ca208aa1cdb3c628dbe5bb74ad36ba..4f07660779b2692c8c5a3c9647cda6017f221fd2 100644 (file)
--- a/src/test/bench/rt-spawn-rate.rs
+++ b/src/test/bench/rt-spawn-rate.rs
@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![no_start]
+
+extern crate green;
+extern crate rustuv;
+
 use std::task::spawn;
 use std::os;
 use std::uint;
@@ -15,6 +20,11 @@
 // Very simple spawn rate test. Spawn N tasks that do nothing and
 // return.
 
+#[start]
+fn start(argc: int, argv: **u8) -> int {
+    green::start(argc, argv, rustuv::event_loop, main)
+}
+
 fn main() {
 
     let args = os::args();