From 3b336b20ce5ffa73950685ef3a2e2e236d53ba17 Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Wed, 9 Jul 2014 16:22:39 +0200 Subject: [PATCH] debuginfo: Make sure that only one LLDB test task is run at a time. Some older versions of LLDB have problems with multiple instances running in parallel. This commit makes sure we don't do that. --- src/compiletest/compiletest.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 4de66d8746fb..07e331c2a396 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -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; @@ -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