Verify wasmkit is a universal binary #163
Merged
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
- Test runs only on Darwin - Check compares output of 'file' tool (exists on macOS and Linux) - Similar test could verify other executables (but need BOM list?)
|
@swift-ci test |
|
I kicked off tests on this one in the toolchain repo on |
|
Cherry-picked for 6.2 branch in #164 |
in https://ci.swift.org/job/swift-PR-toolchain-macos/1995/consoleText LGTM, thanks! |
MaxDesiatov
approved these changes
Jun 24, 2025
MaxDesiatov
pushed a commit
that referenced
this pull request
Jun 26, 2025
**Explanation**: for release in 6.2, test wasmkit, a new toolchain executable, as universal binary on macOS using file | FileCheck. **Scope**: Runs on Darwin only. **Issues**: Resolves swiftlang/swift#82390 **Original PRs**: #163 **Risk**: Depends on 'file' tool in OS (in macOS and Linux). False positive possible after universal architecture changes since only checking text "universal binary". **Testing**: kateinoigakukun manually verified wasmkit is universal after change in swift main swiftlang/swift#82390, and this tests it in CI. **Reviewers**: @MaxDesiatov
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.
Requested in swift PR-82393
lit.cfg: To configure wasmkit, this adds substitution variable and checks path exists
test....py: To check wasmkit executable binary is universal, this uses
filetool from the OSfileshould be available on all macOS (and also available on Linux)FileCheck, but does not verify formatsTest put in
test-snapshot-binariesas peer of rpath tests (instead of in wasmkit dir)swift/utils/swift_build_support/swift_build_support/productswasmkit.py#run_swift_build()handles both rpath and universal-binaryPR could work as-is, or be extended:
(Also please let me know if a swift-integration-test issue is preferred before this PR, to handle issue/PR scope discussions)