about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo>2014-10-26 10:57:29 +0100
committerMichael Woerister <michaelwoerister@posteo>2014-10-26 18:09:06 +0100
commitca0446d10795691e3fc206794ac7fbd441442b34 (patch)
tree918056809a3293d70d8aba4cbc842c9224610b95
parentcb943b7d2b179bdb0a97afedbbb092f1a7e7638c (diff)
downloadrust-ca0446d10795691e3fc206794ac7fbd441442b34.tar.gz
rust-ca0446d10795691e3fc206794ac7fbd441442b34.zip
debuginfo: Set RUST_TEST_TASKS to 1 again for LLDB tests
-rw-r--r--src/compiletest/compiletest.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 7af25de1f6f..018d77b67cd 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -25,7 +25,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;
 
@@ -244,6 +244,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