Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

perform sanity checks before initiating cross-compilation in MirOpt #118050

Closed
wants to merge 1 commit into from

Conversation

onur-ozkan
Copy link
Member

from #115130

Fix the bootstrap santity check to also check for the relevant cross compilation target(s) when --bless is used

This PR fixes that.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Nov 18, 2023

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 18, 2023
@Noratrieb
Copy link
Member

Noratrieb commented Nov 19, 2023

does this mean that running MIR opt tests, even just for the host, always fails if the cross compilation toolchain isn't installed?

@onur-ozkan
Copy link
Member Author

Even just for the host, MirOpt test with --bless flag fails due to missing toolchain.

@Noratrieb
Copy link
Member

can we fix that? i would very much like to be able to test the host while ignoring the cross compilation, with a big warning

@onur-ozkan
Copy link
Member Author

Sure I can do that. Good idea.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2023
@onur-ozkan
Copy link
Member Author

// We use custom logic to bless the mir-opt suite: mir-opt tests have multiple variants
// (32bit vs 64bit, and panic=abort vs panic=unwind), and all of them needs to be blessed.
// When blessing, we try best-effort to also bless the other variants, to aid developers.
if builder.config.cmd.bless() {

Hmm, I need to be sure if blessing will continue working as expected when skipping the cross-target.

cc @pietroalbini

@bors
Copy link
Contributor

bors commented Feb 7, 2024

☔ The latest upstream changes (presumably #120060) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-lang rust-lang deleted a comment from IlayBenjamin Feb 7, 2024
@saethlin
Copy link
Member

saethlin commented Feb 7, 2024

I think this PR is no longer required since #120060 ? Buildling MIR-only sysroots is intended to obviate needing these checks.

@onur-ozkan
Copy link
Member Author

I think this PR is no longer required since #120060 ? Buildling MIR-only sysroots is intended to obviate needing these checks.

Yes, this is no longer needed. Thank you!

@onur-ozkan onur-ozkan closed this Feb 8, 2024
@onur-ozkan onur-ozkan deleted the 115130-p1 branch February 17, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants