mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't stop test if llvm FileCheck cannot be found

Browse Source
This commit is contained in:
Guillaume Gomez 2023-12-20 21:44:12 +01:00
parent 87a704a227
commit 6631dd9dd2
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build_system/src/test.rs
View File

@ -524,23 +524,25 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<(), String> {
Ok(cargo)
}
})?;
let llvm_filecheck = String::from_utf8(
run_command_with_env(
&[
&"bash",
&"-c",
&"which FileCheck-10 || \
let llvm_filecheck = match run_command_with_env(
&[
&"bash",
&"-c",
&"which FileCheck-10 || \
which FileCheck-11 || \
which FileCheck-12 || \
which FileCheck-13 || \
which FileCheck-14",
],
rust_dir,
Some(env),
)?
.stdout,
)
.map_err(|error| format!("Failed to retrieve LLVM FileCheck: {:?}", error))?;
],
rust_dir,
Some(env),
) {
Ok(cmd) => String::from_utf8_lossy(&cmd.stdout).to_string(),
Err(_) => {
eprintln!("Failed to retrieve LLVM FileCheck, ignoring...");
String::new()
}
};
std::fs::write(
"rust/config.toml",
&format!(