Raise the file descriptor limits when running compiletest
We already do this for libstd tests automatically, and compiletest runs into the same problems where when forking lots of processes lots of file descriptors are created. On OSX we can use specific syscalls to raise the limits, in this situation, though. Closes #8904
This commit is contained in:
parent
fc9fa2cb6c
commit
aeb2f88a48
@ -16,6 +16,7 @@
|
|||||||
extern mod extra;
|
extern mod extra;
|
||||||
|
|
||||||
use std::os;
|
use std::os;
|
||||||
|
use std::rt;
|
||||||
use std::f64;
|
use std::f64;
|
||||||
|
|
||||||
use extra::getopts;
|
use extra::getopts;
|
||||||
@ -223,6 +224,10 @@ pub fn mode_str(mode: mode) -> ~str {
|
|||||||
pub fn run_tests(config: &config) {
|
pub fn run_tests(config: &config) {
|
||||||
let opts = test_opts(config);
|
let opts = test_opts(config);
|
||||||
let tests = make_tests(config);
|
let tests = make_tests(config);
|
||||||
|
// sadly osx needs some file descriptor limits raised for running tests in
|
||||||
|
// parallel (especially when we have lots and lots of child processes).
|
||||||
|
// For context, see #8904
|
||||||
|
rt::test::prepare_for_lots_of_tests();
|
||||||
let res = test::run_tests_console(&opts, tests);
|
let res = test::run_tests_console(&opts, tests);
|
||||||
if !res { fail!("Some tests failed"); }
|
if !res { fail!("Some tests failed"); }
|
||||||
}
|
}
|
||||||
|
@ -144,6 +144,12 @@ mod darwin_fd_limit {
|
|||||||
pub unsafe fn raise_fd_limit() {}
|
pub unsafe fn raise_fd_limit() {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
pub fn prepare_for_lots_of_tests() {
|
||||||
|
// Bump the fd limit on OS X. See darwin_fd_limit for an explanation.
|
||||||
|
unsafe { darwin_fd_limit::raise_fd_limit() }
|
||||||
|
}
|
||||||
|
|
||||||
/// Create more than one scheduler and run a function in a task
|
/// Create more than one scheduler and run a function in a task
|
||||||
/// in one of the schedulers. The schedulers will stay alive
|
/// in one of the schedulers. The schedulers will stay alive
|
||||||
/// until the function `f` returns.
|
/// until the function `f` returns.
|
||||||
@ -153,8 +159,8 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
|
|||||||
use rt::sched::Shutdown;
|
use rt::sched::Shutdown;
|
||||||
use rt::util;
|
use rt::util;
|
||||||
|
|
||||||
// Bump the fd limit on OS X. See darwin_fd_limit for an explanation.
|
// see comment in other function (raising fd limits)
|
||||||
unsafe { darwin_fd_limit::raise_fd_limit() }
|
prepare_for_lots_of_tests();
|
||||||
|
|
||||||
let f = Cell::new(f);
|
let f = Cell::new(f);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user