user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle gdb command failure gracefully in compiletest

Browse source 
Previously, if the gdb command was available, but threw an error, compiletest would panic.  This is obviously not good. Now, gdb is treated as missing if calling `gdb --version` does not output anything on stdout.
This commit is contained in:
varkor 2018-02-23 23:54:24 +00:00
parent 063deba92e
commit 70db41cdf7
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tools/compiletest/src/main.rs
View file

@ -736,17 +736,12 @@ fn analyze_gdb(gdb: Option<String>) -> (Option<String>, Option<u32>, bool) {
Some(ref s) => s,
};
let version_line = Command::new(gdb)
.arg("--version")
.output()
.map(|output| {
String::from_utf8_lossy(&output.stdout)
.lines()
.next()
.unwrap()
.to_string()
})
.ok();
let mut version_line = None;
if let Ok(output) = Command::new(gdb).arg("--version").output() {
if let Some(first_line) = String::from_utf8_lossy(&output.stdout).lines().next() {
version_line = Some(first_line.to_string());
}
}
let version = match version_line {
Some(line) => extract_gdb_version(&line),