---

yaml
---
r: 157423
b: refs/heads/snap-stage3
c: dbf0167
h: refs/heads/master
i:
  157421: 4c714fe
  157419: cd37fbd
  157415: 220b7d6
  157407: ab9b619
v: v3

Author: michaelwoerister

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 065caf34f5ff29e04605f95d9c5d511af219439a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 47e8cf76977d7a46ea2aed512c35b175e44815a9
+refs/heads/snap-stage3: dbf0167de924a6f2b579267046fe0a07a124442f
 refs/heads/try: 0ee4d8b0b112c608646fa75463ab4dc59132efd9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/runtest.rs

@@ -653,7 +653,15 @@ 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_src_root = find_rust_src_root(config)
+        .expect("Could not find Rust source root");
+    let rust_pp_module_rel_path = Path::new("./src/etc/lldb_rust_formatters.py");
+    let rust_pp_module_abs_path = rust_src_root.join(rust_pp_module_rel_path)
+                                               .as_str()
+                                               .unwrap()
+                                               .to_string();
+
+    script_str.push_str(format!("command script import {}\n", rust_pp_module_abs_path[])[]);
     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");
@@ -683,18 +691,27 @@ 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 debugger_run_result = run_lldb(config,
+                                       &exe_file,
+                                       &debugger_script,
+                                       &rust_src_root);
 
     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,
+                test_executable: &Path,
+                debugger_script: &Path,
+                rust_src_root: &Path)
+                -> ProcRes {
         // Prepare the lldb_batchmode which executes the debugger script
+        let lldb_script_path = rust_src_root.join(Path::new("./src/etc/lldb_batchmode.py"));
+
         let mut cmd = Command::new("python");
-        cmd.arg("./src/etc/lldb_batchmode.py")
+        cmd.arg(lldb_script_path)
            .arg(test_executable)
            .arg(debugger_script)
            .env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);