Skip to content

Commit

Permalink
debuginfo: Make sure that only one LLDB test task is run at a time.
Browse files Browse the repository at this point in the history
Some older versions of LLDB have problems with multiple instances running in parallel. This commit makes sure we don't do that.
  • Loading branch information
michaelwoerister committed Jul 16, 2014
1 parent c7f45a9 commit 3b336b2
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/compiletest/compiletest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use std::io::fs;
use std::from_str::FromStr;
use getopts::{optopt, optflag, reqopt};
use common::Config;
use common::{Pretty, DebugInfoGdb, Codegen};
use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Codegen};
use util::logv;
use regex::Regex;

Expand Down Expand Up @@ -241,6 +241,16 @@ pub fn run_tests(config: &Config) {
os::setenv("RUST_TEST_TASKS","1");
}

match config.mode {
DebugInfoLldb => {
// Some older versions of LLDB seem to have problems with multiple
// instances running in parallel, so only run one test task at a
// time.
os::setenv("RUST_TEST_TASKS", "1");
}
_ => { /* proceed */ }
}

let opts = test_opts(config);
let tests = make_tests(config);
// sadly osx needs some file descriptor limits raised for running tests in
Expand Down

5 comments on commit 3b336b2

@bors
Copy link
Contributor

@bors bors commented on 3b336b2 Jul 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at michaelwoerister@3b336b2

@bors
Copy link
Contributor

@bors bors commented on 3b336b2 Jul 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging michaelwoerister/rust/lldb-tests-rebased-09-Jul = 3b336b2 into auto

@bors
Copy link
Contributor

@bors bors commented on 3b336b2 Jul 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

michaelwoerister/rust/lldb-tests-rebased-09-Jul = 3b336b2 merged ok, testing candidate = 175f113

@bors
Copy link
Contributor

@bors bors commented on 3b336b2 Jul 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 175f113

Please sign in to comment.