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

Merge pull request #399 from GuillaumeGomez/checkout

Browse Source 
If the rustc commit cannot be retrieve, just checkout the repository
This commit is contained in:
antoyo 2023-12-21 16:11:03 -05:00 committed by GitHub
commit b2e0cc5cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build_system/src/test.rs
View File

@ -503,7 +503,15 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<(), String> {
Some(commit_hash) => commit_hash, Some(commit_hash) => commit_hash,
None => return Err("Couldn't retrieve rustc commit hash".to_string()), None => return Err("Couldn't retrieve rustc commit hash".to_string()),
}; };
run_command_with_output_and_env(&[&"git", &"checkout", &rustc_commit], rust_dir, Some(env))?; if rustc_commit != "unknown" {
run_command_with_output_and_env(
&[&"git", &"checkout", &rustc_commit],
rust_dir,
Some(env),
)?;
} else {
run_command_with_output_and_env(&[&"git", &"checkout"], rust_dir, Some(env))?;
}
let cargo = String::from_utf8( let cargo = String::from_utf8(
run_command_with_env(&[&"rustup", &"which", &"cargo"], rust_dir, Some(env))?.stdout, run_command_with_env(&[&"rustup", &"which", &"cargo"], rust_dir, Some(env))?.stdout,
) )
@ -516,23 +524,25 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<(), String> {
Ok(cargo) Ok(cargo)
} }
})?; })?;
let llvm_filecheck = String::from_utf8( let llvm_filecheck = match run_command_with_env(
run_command_with_env( &[
&[ &"bash",
&"bash", &"-c",
&"-c", &"which FileCheck-10 || \
&"which FileCheck-10 || \
which FileCheck-11 || \ which FileCheck-11 || \
which FileCheck-12 || \ which FileCheck-12 || \
which FileCheck-13 || \ which FileCheck-13 || \
which FileCheck-14", which FileCheck-14",
], ],
rust_dir, rust_dir,
Some(env), Some(env),
)? ) {
.stdout, Ok(cmd) => String::from_utf8_lossy(&cmd.stdout).to_string(),
) Err(_) => {
.map_err(|error| format!("Failed to retrieve LLVM FileCheck: {:?}", error))?; eprintln!("Failed to retrieve LLVM FileCheck, ignoring...");
String::new()
}
};
std::fs::write( std::fs::write(
"rust/config.toml", "rust/config.toml",
&format!( &format!(