---

yaml
---
r: 67075
b: refs/heads/master
c: 098709a
h: refs/heads/master
i:
  67073: 368b194
  67071: d497015
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8d97c905ddecec2e2d0d72926bc4c9e739ccb6e3
+refs/heads/master: 098709aa638bb29998b5e6f2700997b13c2c6712
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libstd/rt/test.rs

@@ -64,18 +64,17 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
     use os;
     use from_str::FromStr;
     use rt::sched::Shutdown;
-    use rt::util;
 
     let f_cell = Cell::new(f);
 
     do run_in_bare_thread {
         let nthreads = match os::getenv("RUST_RT_TEST_THREADS") {
             Some(nstr) => FromStr::from_str(nstr).get(),
             None => {
-                // Using more threads than cores in test code
-                // to force the OS to preempt them frequently.
-                // Assuming that this help stress test concurrent types.
-                util::num_cpus() * 2
+                // A reasonable number of threads for testing
+                // multithreading. NB: It's easy to exhaust OS X's
+                // low maximum fd limit by setting this too high (#7772)
+                4
             }
         };