---

yaml
---
r: 127291
b: refs/heads/try
c: e58d65c
h: refs/heads/master
i:
  127289: c26130d
  127287: a59ab78
v: v3

Author: michaelwoerister

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 87d2bf400ce1bc2cec832f9d5b8e763f06bb7f43
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 12e0f72f517516ac4fce2aed85e6142e9b874bce
-refs/heads/try: e9c5c4c9bd3f9ed73a549c978a8cafe449587663
+refs/heads/try: e58d65c12c5548e314474cfd9605f94ceec0de9b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/compiletest/runtest.rs

@@ -535,6 +535,11 @@ 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");
@@ -543,7 +548,13 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
     script_str.push_str("version\n");
 
     // Switch LLDB into "Rust mode"
-    script_str.push_str("command script import ./src/etc/lldb_rust_formatters.py\n");
+    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");
@@ -573,18 +584,28 @@ 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 debugger_run_result = run_lldb(config, &exe_file, &debugger_script);
+    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);
 
     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, test_executable: &Path, debugger_script: &Path) -> ProcRes {
+    fn run_lldb(config: &Config,
+                lldb_batchmode: &Path,
+                test_executable: &Path,
+                debugger_script: &Path)
+             -> ProcRes {
         // Prepare the lldb_batchmode which executes the debugger script
         let mut cmd = Command::new("python");
-        cmd.arg("./src/etc/lldb_batchmode.py")
+        cmd.arg(lldb_batchmode)
            .arg(test_executable)
            .arg(debugger_script)
            .env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
@@ -612,6 +633,19 @@ 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 {