about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-06 15:38:09 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-03-06 15:38:09 -0800
commit11ddfb8af0fcc69704e09b774de1a382e026f775 (patch)
treedb73e8b4d93181dd7b1d10e97cac1d2c262f2e0e
parentbc409cbb4c4f40afeccb39646efa2ddbc8749b32 (diff)
parentf7594e14b8bf291c7312332947f17f4411a02b3a (diff)
downloadrust-11ddfb8af0fcc69704e09b774de1a382e026f775.tar.gz
rust-11ddfb8af0fcc69704e09b774de1a382e026f775.zip
rollup merge of #23124: brson/oldtests
-rw-r--r--src/test/run-pass/extern-stress.rs49
-rw-r--r--src/test/run-pass/extern-yield.rs48
2 files changed, 0 insertions, 97 deletions
diff --git a/src/test/run-pass/extern-stress.rs b/src/test/run-pass/extern-stress.rs
deleted file mode 100644
index b9e08e47b37..00000000000
--- a/src/test/run-pass/extern-stress.rs
+++ /dev/null
@@ -1,49 +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.
-
-// This creates a bunch of descheduling tasks that run concurrently
-// while holding onto C stacks
-
-extern crate libc;
-use std::thread::Thread;
-
-mod rustrt {
-    extern crate libc;
-
-    #[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)
-                             -> libc::uintptr_t;
-    }
-}
-
-extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
-    if data == 1 {
-        data
-    } else {
-        Thread::yield_now();
-        count(data - 1) + count(data - 1)
-    }
-}
-
-fn count(n: libc::uintptr_t) -> libc::uintptr_t {
-    unsafe {
-        rustrt::rust_dbg_call(cb, n)
-    }
-}
-
-pub fn main() {
-    (0_usize..100).map(|_| {
-        Thread::scoped(move|| {
-            assert_eq!(count(5), 16);
-        })
-    }).collect::<Vec<_>>();
-}
diff --git a/src/test/run-pass/extern-yield.rs b/src/test/run-pass/extern-yield.rs
deleted file mode 100644
index 80428d787f2..00000000000
--- a/src/test/run-pass/extern-yield.rs
+++ /dev/null
@@ -1,48 +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.
-
-extern crate libc;
-use std::thread::Thread;
-
-mod rustrt {
-    extern crate libc;
-
-    #[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)
-                             -> libc::uintptr_t;
-    }
-}
-
-extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {
-    if data == 1 {
-        data
-    } else {
-        count(data - 1) + count(data - 1)
-    }
-}
-
-fn count(n: libc::uintptr_t) -> libc::uintptr_t {
-    unsafe {
-        Thread::yield_now();
-        rustrt::rust_dbg_call(cb, n)
-    }
-}
-
-pub fn main() {
-    (0..10_usize).map(|i| {
-        Thread::scoped(move|| {
-            let result = count(5);
-            println!("result = {}", result);
-            assert_eq!(result, 16);
-        })
-    }).collect::<Vec<_>>();
-}