mk: Move rust_test_helpers out of libstd

There's no need to distribute these ABI helpers for tests with the standard rust
distribution they're only needed for our tests.

Closes #2665

diff --git a/mk/crates.mk b/mk/crates.mk
index cea9133e8351a34c920f2a0e1ea6d63c75645f13..97bf7db5332ce6143ac57e0e27e8b35a0dc5de20 100644 (file)
--- a/mk/crates.mk
+++ b/mk/crates.mk
@@ -84,7 +84,7 @@ DEPS_collections := core alloc
 DEPS_fourcc := syntax std
 DEPS_hexfloat := syntax std
 DEPS_num := std
-DEPS_test := std getopts serialize term time regex
+DEPS_test := std getopts serialize term time regex native:rust_test_helpers
 DEPS_time := std serialize sync
 DEPS_rand := core
 DEPS_url := std

diff --git a/mk/rt.mk b/mk/rt.mk
index c506e8f78cb7d24e5b872e8454b9a65b9e6e67b4..625e1a8d0c7a711be36f36d9c32595f592ffb8b0 100644 (file)
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -35,7 +35,8 @@
 # that's per-target so you're allowed to conditionally add files based on the
 # target.
 ################################################################################
-NATIVE_LIBS := rustrt hoedown uv_support morestack miniz context_switch
+NATIVE_LIBS := rustrt hoedown uv_support morestack miniz context_switch \
+               rust_test_helpers
 
 # $(1) is the target triple
 define NATIVE_LIBRARIES
@@ -53,9 +54,9 @@ NATIVE_DEPS_uv_support_$(1) := rust_uv.c
 NATIVE_DEPS_miniz_$(1) = miniz.c
 NATIVE_DEPS_rustrt_$(1) := rust_builtin.c \
                        rust_android_dummy.c \
-                       rust_test_helpers.c \
                        rust_try.ll \
                        arch/$$(HOST_$(1))/record_sp.S
+NATIVE_DEPS_rust_test_helpers_$(1) := rust_test_helpers.c
 NATIVE_DEPS_morestack_$(1) := arch/$$(HOST_$(1))/morestack.S
 NATIVE_DEPS_context_switch_$(1) := \
                        arch/$$(HOST_$(1))/_context.S

diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
index fd5319d7e6da89aeb0207cba70b04cce3f1f698a..049a91cfdeb42d712a7d8393dd1de962f9aa8363 100644 (file)
--- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
@@ -12,7 +12,7 @@
 
 extern crate libc;
 
-#[link(name="rustrt")]
+#[link(name="rust_test_helpers")]
 extern {
     pub fn rust_get_test_int() -> libc::intptr_t;
 }

diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern-crosscrate-source.rs
index 32c963f3287a24ae6a645c9ed2f71a7d48944ca3..e26f8effb47fc85f852d1d878a7a8d7c0875d0d4 100644 (file)
--- a/src/test/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/auxiliary/extern-crosscrate-source.rs
@@ -16,7 +16,7 @@
 pub mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/auxiliary/foreign_lib.rs b/src/test/auxiliary/foreign_lib.rs
index 8ef806621368030f948e77e9b1fa6f189f8f5f9e..a6bbd40f81088fbc738bc508ad5c0665e03dcf94 100644 (file)
--- a/src/test/auxiliary/foreign_lib.rs
+++ b/src/test/auxiliary/foreign_lib.rs
@@ -13,7 +13,7 @@
 pub mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         fn rust_get_test_int() -> libc::intptr_t;
     }

diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/run-pass/anon-extern-mod.rs
index 9ee1b85d85672503f0e5fb1bc7fe78d83c2970c4..78e1cdabb47486c683a9e43704e473a1f9fde484 100644 (file)
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/run-pass/anon-extern-mod.rs
@@ -10,7 +10,7 @@
 
 extern crate libc;
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     fn rust_get_test_int() -> libc::intptr_t;
 }

diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs
index 89cbbc24475880479465b2ba19b3fb10429c2ef6..6a1dde24d6850509e209c0fcf9a495aa2389bf04 100644 (file)
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/run-pass/c-stack-as-value.rs
@@ -11,7 +11,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_get_test_int() -> libc::intptr_t;
     }

diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/run-pass/extern-call-deep.rs
index 84574fb6787d29fc53705ed81bc39db85b70f92b..d05057ea2519b70f656a8cffabd2ed2f0a7a0d90 100644 (file)
--- a/src/test/run-pass/extern-call-deep.rs
+++ b/src/test/run-pass/extern-call-deep.rs
@@ -13,7 +13,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/run-pass/extern-call-deep2.rs
index 60b80356d9faa263e2b0228126e0d055e9bb55db..654541dcde0bef43ce2be636b9c8d06228adb362 100644 (file)
--- a/src/test/run-pass/extern-call-deep2.rs
+++ b/src/test/run-pass/extern-call-deep2.rs
@@ -14,7 +14,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/extern-call-indirect.rs b/src/test/run-pass/extern-call-indirect.rs
index 391fdc616dc2e29014e3120d74b192f744789f8f..8db745424b21eb6b29f5d49173f4b313526286b3 100644 (file)
--- a/src/test/run-pass/extern-call-indirect.rs
+++ b/src/test/run-pass/extern-call-indirect.rs
@@ -13,7 +13,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/run-pass/extern-call-scrub.rs
index a1aa2adc4310aeecf0b5f6b555b583f57c68988b..07d425dcdadbd7e589d31a911ff46b355a3c2fe7 100644 (file)
--- a/src/test/run-pass/extern-call-scrub.rs
+++ b/src/test/run-pass/extern-call-scrub.rs
@@ -18,7 +18,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/extern-pass-TwoU16s.rs b/src/test/run-pass/extern-pass-TwoU16s.rs
index aace680bea0a614b4f6951e7cb0b90d85d8a319a..8a9231b640e83efc9254b8142d4f15bc53816fc4 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU16s.rs
+++ b/src/test/run-pass/extern-pass-TwoU16s.rs
@@ -16,7 +16,7 @@ struct TwoU16s {
     one: u16, two: u16
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_TwoU16s(v: TwoU16s) -> TwoU16s;
 }

diff --git a/src/test/run-pass/extern-pass-TwoU32s.rs b/src/test/run-pass/extern-pass-TwoU32s.rs
index fb2188fb6df0b100107c1f9dfa214a2a62df0d30..480eef1c6e9d9b79f262025b1ec646a0bba9ff82 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU32s.rs
+++ b/src/test/run-pass/extern-pass-TwoU32s.rs
@@ -16,7 +16,7 @@ struct TwoU32s {
     one: u32, two: u32
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_TwoU32s(v: TwoU32s) -> TwoU32s;
 }

diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/run-pass/extern-pass-TwoU64s.rs
index f975dff0e7d022b36cf1fe5ddda19ee151617708..ca0df4728c6b002dceb1bc026b176a9beea1ab71 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU64s.rs
+++ b/src/test/run-pass/extern-pass-TwoU64s.rs
@@ -16,7 +16,7 @@ struct TwoU64s {
     one: u64, two: u64
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_TwoU64s(v: TwoU64s) -> TwoU64s;
 }

diff --git a/src/test/run-pass/extern-pass-TwoU8s.rs b/src/test/run-pass/extern-pass-TwoU8s.rs
index 0d5b1b789c6087600c22f1e6fd6f7f6620f02bfd..7aeb0a0ec84eaa73aa6857af02dfdb10300ca865 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU8s.rs
+++ b/src/test/run-pass/extern-pass-TwoU8s.rs
@@ -16,7 +16,7 @@ struct TwoU8s {
     one: u8, two: u8
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_TwoU8s(v: TwoU8s) -> TwoU8s;
 }

diff --git a/src/test/run-pass/extern-pass-char.rs b/src/test/run-pass/extern-pass-char.rs
index 85d0463fe7252c3d57a388ccf10e14e65b4fea0e..49c3bf62dbc859a57236716eb8cf44ca49c7abb2 100644 (file)
--- a/src/test/run-pass/extern-pass-char.rs
+++ b/src/test/run-pass/extern-pass-char.rs
@@ -10,7 +10,7 @@
 
 // Test a function that takes/returns a u8.
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_u8(v: u8) -> u8;
 }

diff --git a/src/test/run-pass/extern-pass-double.rs b/src/test/run-pass/extern-pass-double.rs
index 2d35fe6043e8fc013cb2184c381d573f4ab7b4a7..c33c9ee3027f761580ecc802a3c4b61ed9a9326a 100644 (file)
--- a/src/test/run-pass/extern-pass-double.rs
+++ b/src/test/run-pass/extern-pass-double.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_double(v: f64) -> f64;
 }

diff --git a/src/test/run-pass/extern-pass-empty.rs b/src/test/run-pass/extern-pass-empty.rs
index 4c343fdb1a22c444292c686598c7934acce96e09..272dfc98148ca421186ee0d2a9ae1f6767372691 100644 (file)
--- a/src/test/run-pass/extern-pass-empty.rs
+++ b/src/test/run-pass/extern-pass-empty.rs
@@ -26,7 +26,7 @@ struct ManyInts {
 
 struct Empty;
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     fn rust_dbg_extern_empty_struct(v1: ManyInts, e: Empty, v2: ManyInts);
 }

diff --git a/src/test/run-pass/extern-pass-u32.rs b/src/test/run-pass/extern-pass-u32.rs
index 5ff3353a8c085a4248940e4e351c98903239b260..07c04af8e1bfd9ce95901d2ae0456e684c81446a 100644 (file)
--- a/src/test/run-pass/extern-pass-u32.rs
+++ b/src/test/run-pass/extern-pass-u32.rs
@@ -10,7 +10,7 @@
 
 // Test a function that takes/returns a u32.
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_u32(v: u32) -> u32;
 }

diff --git a/src/test/run-pass/extern-pass-u64.rs b/src/test/run-pass/extern-pass-u64.rs
index b94c57a7a663d5b62982c17eccef05b3d21c9d06..e19c73ebe2054fa552c7b9dfcd9d7b63ee230abe 100644 (file)
--- a/src/test/run-pass/extern-pass-u64.rs
+++ b/src/test/run-pass/extern-pass-u64.rs
@@ -10,7 +10,7 @@
 
 // Test a call to a function that takes/returns a u64.
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_identity_u64(v: u64) -> u64;
 }

diff --git a/src/test/run-pass/extern-return-TwoU16s.rs b/src/test/run-pass/extern-return-TwoU16s.rs
index 45efbbb278540bb9d2c6ce8c327498a4a3713bc1..95352e670203122b93dcbca48b25c6c3828187cc 100644 (file)
--- a/src/test/run-pass/extern-return-TwoU16s.rs
+++ b/src/test/run-pass/extern-return-TwoU16s.rs
@@ -12,7 +12,7 @@ struct TwoU16s {
     one: u16, two: u16
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_return_TwoU16s() -> TwoU16s;
 }

diff --git a/src/test/run-pass/extern-return-TwoU32s.rs b/src/test/run-pass/extern-return-TwoU32s.rs
index 8258ee623ab229221f7694abd39dfcca696d07b8..81bd0e9559da297ac4a59c7265c248d32dc2cb9d 100644 (file)
--- a/src/test/run-pass/extern-return-TwoU32s.rs
+++ b/src/test/run-pass/extern-return-TwoU32s.rs
@@ -12,7 +12,7 @@ struct TwoU32s {
     one: u32, two: u32
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_return_TwoU32s() -> TwoU32s;
 }

diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/run-pass/extern-return-TwoU64s.rs
index ff6ba0d156e923cb479c1cc391bd54512c09764a..7c37e0f4e686e370d499cdb35e3713ded0f133bf 100644 (file)
--- a/src/test/run-pass/extern-return-TwoU64s.rs
+++ b/src/test/run-pass/extern-return-TwoU64s.rs
@@ -12,7 +12,7 @@ struct TwoU64s {
     one: u64, two: u64
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_return_TwoU64s() -> TwoU64s;
 }

diff --git a/src/test/run-pass/extern-return-TwoU8s.rs b/src/test/run-pass/extern-return-TwoU8s.rs
index 99dbd93fb7d3ed3c6542f73ac7519098caf09ec7..d20f5475c4eeee02fda03b6ffdc57801b0787fe1 100644 (file)
--- a/src/test/run-pass/extern-return-TwoU8s.rs
+++ b/src/test/run-pass/extern-return-TwoU8s.rs
@@ -12,7 +12,7 @@ struct TwoU8s {
     one: u8, two: u8
 }
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     pub fn rust_dbg_extern_return_TwoU8s() -> TwoU8s;
 }

diff --git a/src/test/run-pass/extern-stress.rs b/src/test/run-pass/extern-stress.rs
index 26fc334026f4882cdd67f2c3a6c91d26a68c5aa9..18e771b9b1ef001631507e084bd7c8dcd0179f60 100644 (file)
--- a/src/test/run-pass/extern-stress.rs
+++ b/src/test/run-pass/extern-stress.rs
@@ -17,7 +17,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/extern-yield.rs b/src/test/run-pass/extern-yield.rs
index aec7ee4341241e432a2953513a2d8d2f94a8ccf8..0735cca1864cffc43b3adcc9ca5452c4d7e420e3 100644 (file)
--- a/src/test/run-pass/extern-yield.rs
+++ b/src/test/run-pass/extern-yield.rs
@@ -14,7 +14,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_call(cb: extern "C" fn (libc::uintptr_t) -> libc::uintptr_t,
                              data: libc::uintptr_t)

diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/run-pass/foreign-call-no-runtime.rs
index 989c09146b7d5c54fae100ea06ae3c80d37413af..bd4c89eb8ab39edfc48cefb953635d30e08175d5 100644 (file)
--- a/src/test/run-pass/foreign-call-no-runtime.rs
+++ b/src/test/run-pass/foreign-call-no-runtime.rs
@@ -13,7 +13,7 @@
 use std::mem;
 use std::rt::thread::Thread;
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t),
                      data: libc::uintptr_t) -> libc::uintptr_t;

diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/run-pass/foreign-dupe.rs
index 4da7d0fb7433bafa5c974cf549f3f7f26c8043c1..74c1132625f73a11bb49f941b24a8169a646e6f2 100644 (file)
--- a/src/test/run-pass/foreign-dupe.rs
+++ b/src/test/run-pass/foreign-dupe.rs
@@ -13,7 +13,7 @@
 mod rustrt1 {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_get_test_int() -> libc::intptr_t;
     }
@@ -22,7 +22,7 @@ mod rustrt1 {
 mod rustrt2 {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_get_test_int() -> libc::intptr_t;
     }

diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/run-pass/foreign-no-abi.rs
index 0bf97a7d9b48c69dd38d5e2c66cbf6d5bbd8d06c..2af02feb21d771445e00d57e7356947e3dda1a12 100644 (file)
--- a/src/test/run-pass/foreign-no-abi.rs
+++ b/src/test/run-pass/foreign-no-abi.rs
@@ -13,7 +13,7 @@
 mod rustrt {
     extern crate libc;
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_get_test_int() -> libc::intptr_t;
     }

diff --git a/src/test/run-pass/static-mut-foreign.rs b/src/test/run-pass/static-mut-foreign.rs
index 4c88caa1d2c198d24d7ec8080537a377b22a3e4b..e5d4591361a6351d257f4bcbeb633e434ce96f57 100644 (file)
--- a/src/test/run-pass/static-mut-foreign.rs
+++ b/src/test/run-pass/static-mut-foreign.rs
@@ -14,7 +14,7 @@
 
 extern crate libc;
 
-#[link(name = "rustrt")]
+#[link(name = "rust_test_helpers")]
 extern {
     static mut rust_dbg_static_mut: libc::c_int;
     pub fn rust_dbg_static_mut_check_four();

diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs
index deac460b15940b6050f4ca12304c83f84e2d2026..93c0e7f5ba5382053d6f515053a103d260bb0fa4 100644 (file)
--- a/src/test/run-pass/struct-return.rs
+++ b/src/test/run-pass/struct-return.rs
@@ -14,7 +14,7 @@ pub struct Floats { a: f64, b: u8, c: f64 }
 mod rustrt {
     use super::{Floats, Quad};
 
-    #[link(name = "rustrt")]
+    #[link(name = "rust_test_helpers")]
     extern {
         pub fn rust_dbg_abi_1(q: Quad) -> Quad;
         pub fn rust_dbg_abi_2(f: Floats) -> Floats;