test: Use a test extern in various foreign fn tests

9 files changed, 18 insertions, 12 deletions

diff --git a/src/rt/rust_test_helpers.cpp b/src/rt/rust_test_helpers.cpp
index 2cfd5cf1eb6..492874a0c26 100644
--- a/src/rt/rust_test_helpers.cpp
+++ b/src/rt/rust_test_helpers.cpp
@@ -176,3 +176,8 @@ rust_dbg_next_port(uintptr_t base_port) {
   next_offset += 1;
   return this_port;
 }
+
+extern "C" CDECL intptr_t
+rust_get_test_int() {
+  return 1;
+}
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index fc7796ef66c..b0c68e639b8 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -266,3 +266,4 @@ rust_set_exit_status_newrt
 rust_get_exit_status_newrt
 rust_take_change_dir_lock
 rust_drop_change_dir_lock
+rust_get_test_int
\ No newline at end of file
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 4bdb6d351d8..3c73bd1b7f2 100644
--- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
@@ -18,5 +18,5 @@
 use std::libc;
 
 extern {
-    pub fn rust_get_argc() -> libc::c_int;
+    pub fn rust_get_test_int() -> libc::intptr_t;
 }
diff --git a/src/test/auxiliary/foreign_lib.rs b/src/test/auxiliary/foreign_lib.rs
index 90399ea48a5..d67e329b04e 100644
--- a/src/test/auxiliary/foreign_lib.rs
+++ b/src/test/auxiliary/foreign_lib.rs
@@ -14,6 +14,6 @@ pub mod rustrt {
     use std::libc;
 
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
index 4eeb85469de..3f1bd830462 100644
--- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
+++ b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
@@ -16,6 +16,6 @@ use anonexternmod::*;
 
 pub fn main() {
     unsafe {
-        rust_get_argc();
+        rust_get_test_int();
     }
 }
diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/run-pass/anon-extern-mod.rs
index 8e03a6393b4..b305007d8d2 100644
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/run-pass/anon-extern-mod.rs
@@ -13,11 +13,11 @@ use std::libc;
 #[abi = "cdecl"]
 #[link_name = "rustrt"]
 extern {
-    fn rust_get_argc() -> libc::c_int;
+    fn rust_get_test_int() -> libc::intptr_t;
 }
 
 pub fn main() {
     unsafe {
-        let _ = rust_get_argc();
+        let _ = rust_get_test_int();
     }
 }
diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/run-pass/foreign-dupe.rs
index c26a1f75b3e..574ef59f0b6 100644
--- a/src/test/run-pass/foreign-dupe.rs
+++ b/src/test/run-pass/foreign-dupe.rs
@@ -17,7 +17,7 @@ mod rustrt1 {
     #[abi = "cdecl"]
     #[link_name = "rustrt"]
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
@@ -27,13 +27,13 @@ mod rustrt2 {
     #[abi = "cdecl"]
     #[link_name = "rustrt"]
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
 pub fn main() {
     unsafe {
-        rustrt1::rust_get_argc();
-        rustrt2::rust_get_argc();
+        rustrt1::rust_get_test_int();
+        rustrt2::rust_get_test_int();
     }
 }
diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/run-pass/foreign-no-abi.rs
index 203e31e859b..d914d52adf5 100644
--- a/src/test/run-pass/foreign-no-abi.rs
+++ b/src/test/run-pass/foreign-no-abi.rs
@@ -14,12 +14,12 @@ mod rustrt {
     use std::libc;
 
     extern {
-        pub fn get_task_id() -> libc::intptr_t;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
 pub fn main() {
     unsafe {
-        rustrt::get_task_id();
+        rustrt::rust_get_test_int();
     }
 }
diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/run-pass/invoke-external-foreign.rs
index 15f08ca23e7..4ccd5355987 100644
--- a/src/test/run-pass/invoke-external-foreign.rs
+++ b/src/test/run-pass/invoke-external-foreign.rs
@@ -19,6 +19,6 @@ extern mod foreign_lib;
 
 pub fn main() {
     unsafe {
-        let foo = foreign_lib::rustrt::rust_get_argc();
+        let foo = foreign_lib::rustrt::rust_get_test_int();
     }
 }