auto merge of #8145 : brson/rust/rttestfixes, r=pcwalton

Two commits here that fix test case dependencies on the old scheduler.

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;
+}

src/rt/rustrt.def.in

@@ -265,3 +265,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

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;
 }

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;
     }
 }

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();
     }
 }

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();
     }
 }

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();
     }
 }

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();
     }
 }

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();
     }
 }

src/test/run-pass/rt-sched-1.rs

@@ -1,60 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Tests of the runtime's scheduler interface
-
-use std::cast;
-use std::comm::*;
-use std::libc;
-
-pub type sched_id = int;
-pub type task_id = *libc::c_void;
-
-pub type task = *libc::c_void;
-pub type closure = *libc::c_void;
-
-mod rustrt {
-    use super::{closure, sched_id, task, task_id};
-
-    use std::libc;
-
-    extern {
-        pub fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
-        pub fn rust_get_sched_id() -> sched_id;
-        pub fn rust_new_task_in_sched(id: sched_id) -> task_id;
-        pub fn start_task(id: task_id, f: closure);
-    }
-}
-
-pub fn main() {
-    unsafe {
-        let (po, ch) = stream();
-        let parent_sched_id = rustrt::rust_get_sched_id();
-        error!("parent %?", parent_sched_id);
-        let num_threads = 1u;
-        let new_sched_id = rustrt::rust_new_sched(num_threads);
-        error!("new_sched_id %?", new_sched_id);
-        let new_task_id = rustrt::rust_new_task_in_sched(new_sched_id);
-        assert!(!new_task_id.is_null());
-        let f: ~fn() = || {
-            unsafe {
-                let child_sched_id = rustrt::rust_get_sched_id();
-                error!("child_sched_id %?", child_sched_id);
-                assert!(child_sched_id != parent_sched_id);
-                assert_eq!(child_sched_id, new_sched_id);
-                ch.send(());
-            }
-        };
-        let fptr = cast::transmute(&f);
-        rustrt::start_task(new_task_id, fptr);
-        cast::forget(f);
-        po.recv();
-    }
-}