diff options
| author | Ben Blum <bblum@andrew.cmu.edu> | 2012-07-17 22:10:52 -0400 |
|---|---|---|
| committer | Ben Blum <bblum@andrew.cmu.edu> | 2012-07-17 22:16:55 -0400 |
| commit | 30d94fe9a2fe9c526e63700da3f3012f579caafd (patch) | |
| tree | 643c07cffad77aaf4b50dff2687659c5b5eeab37 | |
| parent | 4ee4a2ab3166cf10bbcfc240820f1285f7070363 (diff) | |
| download | rust-30d94fe9a2fe9c526e63700da3f3012f579caafd.tar.gz rust-30d94fe9a2fe9c526e63700da3f3012f579caafd.zip | |
finish fixing broken un-unsupervise windows tests
| -rw-r--r-- | src/test/run-pass/binops.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/c-stack-as-value.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-506.rs | 7 | ||||
| -rw-r--r-- | src/test/run-pass/morestack6.rs | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs index 09743affa79..365198a0fbc 100644 --- a/src/test/run-pass/binops.rs +++ b/src/test/run-pass/binops.rs @@ -116,8 +116,8 @@ fn test_fn() { #[abi = "cdecl"] #[nolink] extern mod test { - fn rust_get_sched_id(); - fn get_task_id(); + fn rust_get_sched_id() -> libc::intptr_t; + fn get_task_id() -> libc::intptr_t; } fn test_foreign_fn() { diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs index 0947be381f2..8164913d0f7 100644 --- a/src/test/run-pass/c-stack-as-value.rs +++ b/src/test/run-pass/c-stack-as-value.rs @@ -1,6 +1,6 @@ #[abi = "cdecl"] extern mod rustrt { - fn get_task_id(); + fn get_task_id() -> libc::intptr_t; } fn main() { diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs index 565e270baa2..72aff29f9ff 100644 --- a/src/test/run-pass/issue-506.rs +++ b/src/test/run-pass/issue-506.rs @@ -9,7 +9,10 @@ import task; #[abi = "cdecl"] extern mod rustrt { - fn get_task_id(); + fn get_task_id() -> libc::intptr_t; } -fn main() { task::spawn(rustrt::get_task_id); } +fn main() { + let f: fn() -> libc::intptr_t = rustrt::get_task_id; + task::spawn(unsafe { unsafe::reinterpret_cast(f) }); +} diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs index 5750b9d8c87..b345679f46d 100644 --- a/src/test/run-pass/morestack6.rs +++ b/src/test/run-pass/morestack6.rs @@ -11,7 +11,7 @@ extern mod rustrt { fn rust_get_sched_id() -> libc::intptr_t; fn last_os_error() -> ~str; fn rust_getcwd() -> ~str; - fn get_task_id(); + fn get_task_id() -> libc::intptr_t; fn sched_threads(); fn rust_get_task(); } |