mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 12:33:57 +00:00
Update test.rs
This commit is contained in:
parent
fa12064d6d
commit
a6ef91e414
|
@ -7,7 +7,6 @@
|
|||
use std::ffi::OsStr;
|
||||
use std::ffi::OsString;
|
||||
use std::fs;
|
||||
use std::io::ErrorKind;
|
||||
use std::iter;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::{Command, Stdio};
|
||||
|
@ -1817,6 +1816,16 @@ fn run(self, builder: &Builder<'_>) {
|
|||
cmd.arg("--gdb").arg(gdb);
|
||||
}
|
||||
|
||||
let lldb_exe = builder.config.lldb.clone().unwrap_or_else(|| PathBuf::from("lldb"));
|
||||
let lldb_version = Command::new(&lldb_exe)
|
||||
.arg("--version")
|
||||
.output()
|
||||
.map(|output| {
|
||||
(String::from_utf8_lossy(&output.stdout).to_string(), output.status.success())
|
||||
})
|
||||
.ok()
|
||||
.and_then(|(output, success)| if success { Some(output) } else { None });
|
||||
if let Some(ref vers) = lldb_version {
|
||||
let run = |cmd: &mut Command| {
|
||||
cmd.output().map(|output| {
|
||||
String::from_utf8_lossy(&output.stdout)
|
||||
|
@ -1826,17 +1835,6 @@ fn run(self, builder: &Builder<'_>) {
|
|||
.to_string()
|
||||
})
|
||||
};
|
||||
|
||||
let lldb_exe = builder.config.lldb.clone().unwrap_or_else(|| PathBuf::from("lldb"));
|
||||
let lldb_version = Command::new(&lldb_exe)
|
||||
.arg("--version")
|
||||
.output()
|
||||
.and_then(|output| {
|
||||
if output.status.success() { Ok(output) } else { Err(ErrorKind::Other.into()) }
|
||||
})
|
||||
.map(|output| String::from_utf8_lossy(&output.stdout).to_string())
|
||||
.ok();
|
||||
if let Some(ref vers) = lldb_version {
|
||||
cmd.arg("--lldb-version").arg(vers);
|
||||
let lldb_python_dir = run(Command::new(&lldb_exe).arg("-P")).ok();
|
||||
if let Some(ref dir) = lldb_python_dir {
|
||||
|
|
Loading…
Reference in a new issue