From 5cdc36517ed9939ef9f10736c269e5988062e479 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 5 Jun 2014 11:08:43 -0700 Subject: [PATCH] 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 --- mk/crates.mk | 2 +- mk/rt.mk | 5 +++-- src/test/auxiliary/anon-extern-mod-cross-crate-1.rs | 2 +- src/test/auxiliary/extern-crosscrate-source.rs | 2 +- src/test/auxiliary/foreign_lib.rs | 2 +- src/test/run-pass/anon-extern-mod.rs | 2 +- src/test/run-pass/c-stack-as-value.rs | 2 +- src/test/run-pass/extern-call-deep.rs | 2 +- src/test/run-pass/extern-call-deep2.rs | 2 +- src/test/run-pass/extern-call-indirect.rs | 2 +- src/test/run-pass/extern-call-scrub.rs | 2 +- src/test/run-pass/extern-pass-TwoU16s.rs | 2 +- src/test/run-pass/extern-pass-TwoU32s.rs | 2 +- src/test/run-pass/extern-pass-TwoU64s.rs | 2 +- src/test/run-pass/extern-pass-TwoU8s.rs | 2 +- src/test/run-pass/extern-pass-char.rs | 2 +- src/test/run-pass/extern-pass-double.rs | 2 +- src/test/run-pass/extern-pass-empty.rs | 2 +- src/test/run-pass/extern-pass-u32.rs | 2 +- src/test/run-pass/extern-pass-u64.rs | 2 +- src/test/run-pass/extern-return-TwoU16s.rs | 2 +- src/test/run-pass/extern-return-TwoU32s.rs | 2 +- src/test/run-pass/extern-return-TwoU64s.rs | 2 +- src/test/run-pass/extern-return-TwoU8s.rs | 2 +- src/test/run-pass/extern-stress.rs | 2 +- src/test/run-pass/extern-yield.rs | 2 +- src/test/run-pass/foreign-call-no-runtime.rs | 2 +- src/test/run-pass/foreign-dupe.rs | 4 ++-- src/test/run-pass/foreign-no-abi.rs | 2 +- src/test/run-pass/static-mut-foreign.rs | 2 +- src/test/run-pass/struct-return.rs | 2 +- 31 files changed, 34 insertions(+), 33 deletions(-) diff --git a/mk/crates.mk b/mk/crates.mk index cea9133e8351a..97bf7db5332ce 100644 --- 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 c506e8f78cb7d..625e1a8d0c7a7 100644 --- 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 fd5319d7e6da8..049a91cfdeb42 100644 --- 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 32c963f3287a2..e26f8effb47fc 100644 --- a/src/test/auxiliary/extern-crosscrate-source.rs +++ b/src/test/auxiliary/extern-crosscrate-source.rs @@ -16,7 +16,7 @@ extern crate libc; 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 8ef8066213680..a6bbd40f81088 100644 --- 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 9ee1b85d85672..78e1cdabb4748 100644 --- 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 89cbbc2447588..6a1dde24d6850 100644 --- 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 84574fb6787d2..d05057ea2519b 100644 --- a/src/test/run-pass/extern-call-deep.rs +++ b/src/test/run-pass/extern-call-deep.rs @@ -13,7 +13,7 @@ extern crate libc; 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 60b80356d9faa..654541dcde0be 100644 --- a/src/test/run-pass/extern-call-deep2.rs +++ b/src/test/run-pass/extern-call-deep2.rs @@ -14,7 +14,7 @@ use std::task; 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 391fdc616dc2e..8db745424b21e 100644 --- a/src/test/run-pass/extern-call-indirect.rs +++ b/src/test/run-pass/extern-call-indirect.rs @@ -13,7 +13,7 @@ extern crate libc; 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 a1aa2adc4310a..07d425dcdadbd 100644 --- a/src/test/run-pass/extern-call-scrub.rs +++ b/src/test/run-pass/extern-call-scrub.rs @@ -18,7 +18,7 @@ use std::task; 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 aace680bea0a6..8a9231b640e83 100644 --- 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 fb2188fb6df0b..480eef1c6e9d9 100644 --- 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 f975dff0e7d02..ca0df4728c6b0 100644 --- 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 0d5b1b789c608..7aeb0a0ec84ea 100644 --- 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 85d0463fe7252..49c3bf62dbc85 100644 --- 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 2d35fe6043e8f..c33c9ee3027f7 100644 --- 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 4c343fdb1a22c..272dfc98148ca 100644 --- 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 5ff3353a8c085..07c04af8e1bfd 100644 --- 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 b94c57a7a663d..e19c73ebe2054 100644 --- 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 45efbbb278540..95352e6702031 100644 --- 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 8258ee623ab22..81bd0e9559da2 100644 --- 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 ff6ba0d156e92..7c37e0f4e686e 100644 --- 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 99dbd93fb7d3e..d20f5475c4eee 100644 --- 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 26fc334026f48..18e771b9b1ef0 100644 --- a/src/test/run-pass/extern-stress.rs +++ b/src/test/run-pass/extern-stress.rs @@ -17,7 +17,7 @@ use std::task; 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 aec7ee4341241..0735cca1864cf 100644 --- a/src/test/run-pass/extern-yield.rs +++ b/src/test/run-pass/extern-yield.rs @@ -14,7 +14,7 @@ use std::task; 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 989c09146b7d5..bd4c89eb8ab39 100644 --- a/src/test/run-pass/foreign-call-no-runtime.rs +++ b/src/test/run-pass/foreign-call-no-runtime.rs @@ -13,7 +13,7 @@ extern crate libc; 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 4da7d0fb7433b..74c1132625f73 100644 --- 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 0bf97a7d9b48c..2af02feb21d77 100644 --- 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 4c88caa1d2c19..e5d4591361a63 100644 --- 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 deac460b15940..93c0e7f5ba538 100644 --- 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;