---

yaml
---
r: 124631
b: refs/heads/try
c: 154ca08
h: refs/heads/master
i:
  124629: 715f486
  124627: 333e96d
  124623: 7fd624d
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f15d6d28396e8700b6c3f2704204a2769e710403
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: dff46952ab5c4567d1b5b35bfbd8befc45cdd38e
+refs/heads/try: 154ca0838868ca08a8aae20f6af245e2b970a3de
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/configure

@@ -502,9 +502,20 @@ probe CFG_LLDB             lldb
 
 if [ ! -z "$CFG_LLDB" ]
 then
-    # Try-branch hack
-    CFG_LLDB_PYTHON_DIR="/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/Python"
-    putvar CFG_LLDB_PYTHON_DIR
+    # If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
+    # LLDB via the -P commandline options.
+    if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
+    then
+        CFG_LLDB_PYTHON_DIR=$($CFG_LLDB -P)
+
+        # If CFG_LLDB_PYTHON_DIR is not a valid directory, set it to something more readable
+        if [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
+        then
+            CFG_LLDB_PYTHON_DIR="LLDB_PYTHON_DIRECTORY_NOT_FOUND"
+        fi
+
+        putvar CFG_LLDB_PYTHON_DIR
+    fi
 fi
 
 step_msg "looking for target specific programs"

branches/try/mk/tests.mk

@@ -176,7 +176,10 @@ check: cleantmptestlogs cleantestlibs check-notidy tidy
 check-notidy: cleantmptestlogs cleantestlibs all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-check-lite: cleantestlibs cleantmptestlogs check-stage1-debuginfo-lldb \
+check-lite: cleantestlibs cleantmptestlogs \
+	$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
+	check-stage2-rpass \
+	check-stage2-rfail check-stage2-cfail check-stage2-rmake
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
 check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
@@ -550,10 +553,8 @@ ifeq ($(CFG_LLDB),)
 CTEST_DISABLE_debuginfo-lldb = "no lldb found"
 endif
 
-# Enable LLDB tests only on apple-darwin
-ifneq ($(CFG_OSTYPE),apple-darwin)
-CTEST_DISABLE_debuginfo-lldb = "LLDB tests only enabled on apple-darwin"
-endif
+# Completely disable LLDB tests for now
+CTEST_DISABLE_debuginfo-lldb = "LLDB tests are not enabled yet"
 
 ifeq ($(CFG_CLANG),)
 CTEST_DISABLE_codegen = "no clang found"

branches/try/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, DebugInfoLldb, Codegen};
+use common::{Pretty, DebugInfoGdb, Codegen};
 use util::logv;
 use regex::Regex;
 
@@ -241,16 +241,6 @@ 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

branches/try/src/compiletest/runtest.rs

@@ -532,31 +532,10 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
         breakpoint_lines
     } = parse_debugger_commands(testfile, "lldb");
 
-    let rust_src_root = match find_rust_src_root(config) {
-        Some(path) => path,
-        None => fatal("Could not find Rust source root directory")
-    };
-
     // Write debugger script:
     // We don't want to hang when calling `quit` while the process is still running
     let mut script_str = String::from_str("settings set auto-confirm true\n");
 
-    // Make LLDB emit its version, so we have it documented in the test output
-    script_str.push_str("version\n");
-
-    // Switch LLDB into "Rust mode"
-    let rust_formatters_postfix = Path::new("./src/etc/lldb_rust_formatters.py");
-    let lldb_rust_formatters = rust_src_root.join(rust_formatters_postfix);
-
-    script_str.push_str("command script import ");
-    script_str.push_str(lldb_rust_formatters.as_str()
-        .expect("Could not convert lldb_rust_formatters path to UTF-8"));
-    script_str.push_str("\n");
-    script_str.push_str("type summary add --no-value ");
-    script_str.push_str("--python-function lldb_rust_formatters.print_val ");
-    script_str.push_str("-x \".*\" --category Rust\n");
-    script_str.push_str("type category enable Rust\n");
-
     // Set breakpoints on every line that contains the string "#break"
     for line in breakpoint_lines.iter() {
         script_str.push_str(format!("breakpoint set --line {}\n",
@@ -581,28 +560,18 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
     let debugger_script = make_out_name(config, testfile, "debugger.script");
 
     // Let LLDB execute the script via lldb_batchmode.py
-    let lldb_batchmode_path = rust_src_root
-        .join(Path::new("./src/etc/lldb_batchmode.py"));
-
-    let debugger_run_result = run_lldb(config,
-                                       &lldb_batchmode_path,
-                                       &exe_file,
-                                       &debugger_script);
+    let debugger_run_result = run_lldb(config, &exe_file, &debugger_script);
 
     if !debugger_run_result.status.success() {
         fatal_proc_rec("Error while running LLDB", &debugger_run_result);
     }
 
     check_debugger_output(&debugger_run_result, check_lines.as_slice());
 
-    fn run_lldb(config: &Config,
-                lldb_batchmode: &Path,
-                test_executable: &Path,
-                debugger_script: &Path)
-             -> ProcRes {
+    fn run_lldb(config: &Config, test_executable: &Path, debugger_script: &Path) -> ProcRes {
         // Prepare the lldb_batchmode which executes the debugger script
         let mut cmd = Command::new("python");
-        cmd.arg(lldb_batchmode)
+        cmd.arg("./src/etc/lldb_batchmode.py")
            .arg(test_executable)
            .arg(debugger_script)
            .env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
@@ -630,19 +599,6 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
             cmdline: format!("{}", cmd)
         };
     }
-
-    fn find_rust_src_root(config: &Config) -> Option<Path> {
-        let mut path = config.src_base.clone();
-        let path_postfix = Path::new("src/etc/lldb_batchmode.py");
-
-        while path.pop() {
-            if path.join(path_postfix.clone()).is_file() {
-                return Some(path);
-            }
-        }
-
-        return None;
-    }
 }
 
 struct DebuggerCommands {

branches/try/src/etc/lldb_batchmode.py

@@ -31,6 +31,9 @@
 import re
 import atexit
 
+# Terminate the debugger
+atexit.register(lambda: lldb.SBDebugger.Terminate())
+
 # Set this to True for additional output
 DEBUG_OUTPUT = False