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

stabilize ci_rustc_if_unchanged_logic test

Browse Source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2024-10-09 22:22:13 +03:00
parent df1b5d3cc2
commit b27aee9b8b
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bootstrap/src/core/builder/tests.rs
View File

@ -1,7 +1,5 @@
use std::thread; use std::thread;
use build_helper::git::get_closest_merge_commit;
use super::*; use super::*;
use crate::Flags; use crate::Flags;
use crate::core::build_steps::doc::DocumentationFormat; use crate::core::build_steps::doc::DocumentationFormat;
@ -214,8 +212,6 @@ fn alias_and_path_for_library() {
assert_eq!(first(cache.all::<doc::Std>()), &[doc_std!(A => A, stage = 0)]); assert_eq!(first(cache.all::<doc::Std>()), &[doc_std!(A => A, stage = 0)]);
} }
// FIXME: This is failing in various runners in merge CI.
#[ignore]
#[test] #[test]
fn ci_rustc_if_unchanged_logic() { fn ci_rustc_if_unchanged_logic() {
let config = Config::parse_inner( let config = Config::parse_inner(
@ -227,10 +223,6 @@ fn ci_rustc_if_unchanged_logic() {
|&_| Ok(Default::default()), |&_| Ok(Default::default()),
); );
if config.rust_info.is_from_tarball() {
return;
}
let build = Build::new(config.clone()); let build = Build::new(config.clone());
let builder = Builder::new(&build); let builder = Builder::new(&build);
@ -240,26 +232,17 @@ fn ci_rustc_if_unchanged_logic() {
builder.run_step_descriptions(&Builder::get_step_descriptions(config.cmd.kind()), &[]); builder.run_step_descriptions(&Builder::get_step_descriptions(config.cmd.kind()), &[]);
let compiler_path = build.src.join("compiler"); // Make sure "if-unchanged" logic doesn't try to use CI rustc while there are changes
let library_path = build.src.join("library"); // in compiler and/or library.
if config.download_rustc_commit.is_some() {
let has_changes =
config.last_modified_commit(&["compiler", "library"], "download-rustc", true).is_none();
let commit = assert!(
get_closest_merge_commit(Some(&builder.config.src), &builder.config.git_config(), &[ !has_changes,
compiler_path.clone(), "CI-rustc can't be used with 'if-unchanged' while there are changes in compiler and/or library."
library_path.clone(), );
]) }
.unwrap();
let has_changes = !helpers::git(Some(&builder.src))
.args(["diff-index", "--quiet", &commit])
.arg("--")
.args([compiler_path, library_path])
.as_command_mut()
.status()
.unwrap()
.success();
assert!(has_changes == config.download_rustc_commit.is_none());
} }
mod defaults { mod defaults {