Don't try to auto-bless 32-bit mir-opt tests on ARM Mac hosts#112753
Merged
bors merged 1 commit intorust-lang:masterfrom Jun 19, 2023
Merged
Don't try to auto-bless 32-bit mir-opt tests on ARM Mac hosts#112753bors merged 1 commit intorust-lang:masterfrom
mir-opt tests on ARM Mac hosts#112753bors merged 1 commit intorust-lang:masterfrom
Conversation
Blessing 32-bit tests on 64-bit hosts relies on having a corresponding 32-bit target that can be built "easily" on those hosts. ARM Macs don't have a corresponding 32-bit target, so trying to build one is usually going to fail.
Collaborator
|
r? @clubby789 (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Member
Author
|
(There are various other improvements that could be made to the auto-bless machinery, but this is just a small targeted fix to make |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 18, 2023
Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts rust-lang#112418 added special support for automatically blessing 32-bit output on 64-bit hosts, for the subset of `mir-opt` tests that are pointer-width-dependent. This relies on the 64-bit host having some corresponding 32-bit target that can be built “easily”. For most 64-bit hosts this is fine, but ARM Macs don't have a corresponding 32-bit target. (There have never been 32-bit ARM Macs, and ARM Macs don't have the libraries needed for building `i686-apple-darwin`.) There is an entry for `("i686-apple-darwin", "aarch64-apple-darwin")` in the list of corresponding 32-bit platforms, but this doesn't actually work on ARM Macs. Instead, the bootstrap invocation fails to build the necessary 32-bit target support, and nothing gets tested or blessed. According to [this Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Can't.20bless.20any.20mir-opt.20tests.20on.20aarch64.20Mac/near/367109789), that mapping was only added because the author assumed it would work. But since it doesn't actually work on ARM Macs, the solution is to just remove that mapping. With the mapping removed, ARM Macs still can't auto-bless 32-bit output (they will see a warning instead), but at least they can now bless the output of `mir-opt` tests that don't care about pointer width.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2023
…mpiler-errors Rollup of 6 pull requests Successful merges: - rust-lang#112537 (Don't record adjustments twice in `note_source_of_type_mismatch_constraint`) - rust-lang#112663 (cleanup azure leftovers) - rust-lang#112668 (Test `x.ps1` in `msvc` CI job) - rust-lang#112710 (Re-use the deref-pattern recursion instead of duplicating the logic) - rust-lang#112753 (Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts) - rust-lang#112758 (refactor(resolve): delete update_resolution function) r? `@ghost` `@rustbot` modify labels: rollup
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Nov 21, 2023
…rwin, r=albertlarsan68 Remove i686-apple-darwin cross-testing The Xcode SDK no longer ships with 32-bit Intel (i686-apple-darwin) support as of [Xcode 14](https://developer.apple.com/news/upcoming-requirements/?id=06062022a) (related, rust-lang#112753). On an up-to-date Intel Mac, `x.py test --bless` fails. r? `@rust-lang/bootstrap`
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
Nov 21, 2023
…rwin, r=albertlarsan68 Remove i686-apple-darwin cross-testing The Xcode SDK no longer ships with 32-bit Intel (i686-apple-darwin) support as of [Xcode 14](https://developer.apple.com/news/upcoming-requirements/?id=06062022a) (related, rust-lang#112753). On an up-to-date Intel Mac, `x.py test --bless` fails. r? ``@rust-lang/bootstrap``
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 21, 2023
Rollup merge of rust-lang#118083 - calebzulawski:remove-i686-apple-darwin, r=albertlarsan68 Remove i686-apple-darwin cross-testing The Xcode SDK no longer ships with 32-bit Intel (i686-apple-darwin) support as of [Xcode 14](https://developer.apple.com/news/upcoming-requirements/?id=06062022a) (related, rust-lang#112753). On an up-to-date Intel Mac, `x.py test --bless` fails. r? ``@rust-lang/bootstrap``
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#112418 added special support for automatically blessing 32-bit output on 64-bit hosts, for the subset of
mir-opttests that are pointer-width-dependent.This relies on the 64-bit host having some corresponding 32-bit target that can be built “easily”. For most 64-bit hosts this is fine, but ARM Macs don't have a corresponding 32-bit target. (There have never been 32-bit ARM Macs, and ARM Macs don't have the libraries needed for building
i686-apple-darwin.)There is an entry for
("i686-apple-darwin", "aarch64-apple-darwin")in the list of corresponding 32-bit platforms, but this doesn't actually work on ARM Macs. Instead, the bootstrap invocation fails to build the necessary 32-bit target support, and nothing gets tested or blessed.According to this Zulip thread, that mapping was only added because the author assumed it would work. But since it doesn't actually work on ARM Macs, the solution is to just remove that mapping.
With the mapping removed, ARM Macs still can't auto-bless 32-bit output (they will see a warning instead), but at least they can now bless the output of
mir-opttests that don't care about pointer width.