[test] Fix load-invalid-arch.swift to use the "major" architecture #17342
Conversation
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
armv7, armv7s, and armv7k all get encoded as "arm" in today's scheme for swiftmodules, so we can't just use the CPU part of the triple as the expected swiftmodule architecture in the diagnostic.
|
@swift-ci Please test |
|
@tapthaker: Whoops, I forgot about this, and our pre-commit testing doesn't try to run tests for anything but macOS and a few simulators. This look good to you? |
|
Merging to unblock some Apple-internal bots. |
|
@jrose-apple : Makes sense, thank you for fixing it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
armv7, armv7s, and armv7k all get encoded as "arm" in today's scheme for swiftmodules, so we can't just use the CPU part of the triple as the expected swiftmodule architecture in the diagnostic.
rdar://problem/41262878