Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4623d48

Browse files
committedOct 10, 2018
Auto merge of #54764 - tromey:test-rust-lldb, r=alexcrichton
Run debuginfo tests against rust-enabled lldb, when possible If the rust-enabled lldb was built, then use it when running the debuginfo tests. Updating the lldb submodule was necessary as this needed a way to differentiate the rust-enabled lldb, so I added a line to the --version output. This adds compiletest commands to differentiate between the rust-enabled and non-rust-enabled lldb, as is already done for gdb. A new "rust-lldb" header directive is also added, but not used in this patch; I plan to use it in #54004. This updates all the tests.
2 parents eae47a4 + ac33b2e commit 4623d48

File tree

76 files changed

+1405
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1405
-702
lines changed
 

‎src/bootstrap/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,6 @@ pub struct Build {
278278
initial_rustc: PathBuf,
279279
initial_cargo: PathBuf,
280280

281-
// Probed tools at runtime
282-
lldb_version: Option<String>,
283-
lldb_python_dir: Option<String>,
284-
285281
// Runtime state filled in later on
286282
// C/C++ compilers and archiver for all targets
287283
cc: HashMap<Interned<String>, cc::Tool>,
@@ -416,8 +412,6 @@ impl Build {
416412
ar: HashMap::new(),
417413
ranlib: HashMap::new(),
418414
crates: HashMap::new(),
419-
lldb_version: None,
420-
lldb_python_dir: None,
421415
is_sudo,
422416
ci_env: CiEnv::current(),
423417
delayed_failures: RefCell::new(Vec::new()),

‎src/bootstrap/sanity.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,6 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
236236
}
237237
}
238238

239-
let run = |cmd: &mut Command| {
240-
cmd.output().map(|output| {
241-
String::from_utf8_lossy(&output.stdout)
242-
.lines().next().unwrap_or_else(|| {
243-
panic!("{:?} failed {:?}", cmd, output)
244-
}).to_string()
245-
})
246-
};
247-
build.lldb_version = run(Command::new("lldb").arg("--version")).ok();
248-
if build.lldb_version.is_some() {
249-
build.lldb_python_dir = run(Command::new("lldb").arg("-P")).ok();
250-
}
251-
252239
if let Some(ref s) = build.config.ccache {
253240
cmd_finder.must_have(s);
254241
}

0 commit comments

Comments
 (0)
Please sign in to comment.