Skip to content

stabilize ci_rustc_if_unchanged_logic test #131444

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Oct 11, 2024
Merged

stabilize ci_rustc_if_unchanged_logic test #131444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27aee9
stabilize `ci_rustc_if_unchanged_logic` test
onur-ozkan Oct 9, 2024
de744ea
update `rustc_borrowck::places_conflict` doc-comment
onur-ozkan Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_borrowck/src/places_conflict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! we can prove overlap one way or another. Essentially, we treat `Overlap` as
//! a monoid and report a conflict if the product ends up not being `Disjoint`.
//!
//! At each step, if we didn't run out of borrow or place, we know that our elements
//! On each step, if we didn't run out of borrow or place, we know that our elements
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made more sense before 😅 But it's a small change anyway.

//! have the same type, and that they only overlap if they are the identical.
//!
//! For example, if we are comparing these:
Expand Down
39 changes: 11 additions & 28 deletions src/bootstrap/src/core/builder/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::thread;

use build_helper::git::get_closest_merge_commit;

use super::*;
use crate::Flags;
use crate::core::build_steps::doc::DocumentationFormat;
Expand Down Expand Up @@ -214,8 +212,6 @@ fn alias_and_path_for_library() {
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]
fn ci_rustc_if_unchanged_logic() {
let config = Config::parse_inner(
Expand All @@ -227,10 +223,6 @@ fn ci_rustc_if_unchanged_logic() {
|&_| Ok(Default::default()),
);

if config.rust_info.is_from_tarball() {
return;
}

let build = Build::new(config.clone());
let builder = Builder::new(&build);

Expand All @@ -240,26 +232,17 @@ fn ci_rustc_if_unchanged_logic() {

builder.run_step_descriptions(&Builder::get_step_descriptions(config.cmd.kind()), &[]);

let compiler_path = build.src.join("compiler");
let library_path = build.src.join("library");

let commit =
get_closest_merge_commit(Some(&builder.config.src), &builder.config.git_config(), &[
compiler_path.clone(),
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());
// Make sure "if-unchanged" logic doesn't try to use CI rustc while there are changes
// 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();

assert!(
!has_changes,
"CI-rustc can't be used with 'if-unchanged' while there are changes in compiler and/or library."
);
}
}

mod defaults {
Expand Down
Loading