nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 14:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiletest: do not run tests in sub-threads if on valgrind.

Browse Source
This commit is contained in:
Graydon Hoare 2013-08-19 15:08:47 -07:00
parent 19f4ae1415
commit 610b2b58ec
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiletest/runtest.rs
View File

@ -26,6 +26,7 @@ use std::os;
use std::str; use std::str;
use std::task::{spawn_sched, SingleThreaded}; use std::task::{spawn_sched, SingleThreaded};
use std::vec; use std::vec;
use std::unstable::running_on_valgrind;
use extra::test::MetricMap; use extra::test::MetricMap;
@ -38,11 +39,21 @@ pub fn run(config: config, testfile: ~str) {
// that destroys parallelism if we let normal schedulers block. // that destroys parallelism if we let normal schedulers block.
// It should be possible to remove this spawn once std::run is // It should be possible to remove this spawn once std::run is
// rewritten to be non-blocking. // rewritten to be non-blocking.
do spawn_sched(SingleThreaded) { //
// We do _not_ create another thread if we're running on V because
// it serializes all threads anyways.
if running_on_valgrind() {
let config = config.take(); let config = config.take();
let testfile = testfile.take(); let testfile = testfile.take();
let mut _mm = MetricMap::new(); let mut _mm = MetricMap::new();
run_metrics(config, testfile, &mut _mm); run_metrics(config, testfile, &mut _mm);
} else {
do spawn_sched(SingleThreaded) {
let config = config.take();
let testfile = testfile.take();
let mut _mm = MetricMap::new();
run_metrics(config, testfile, &mut _mm);
}
} }
} }