Skip to content

Move installed XCTest.swiftmodule up one directory on Windows #177

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

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Move installed XCTest.swiftmodule up one directory on Windows #177

merged 1 commit into from
Mar 9, 2023

Conversation

tristanlabelle
Copy link
Contributor

@tristanlabelle tristanlabelle commented Mar 7, 2023

The layout of the XCTest directories on Windows is currently inconsistent between local builds and installed builds. This change resolves the inconsistency by updating swiftmodule directory location for XCTest from:

XCTest\usr\lib\swift\windows\%ARCH%\XCTest.swiftmodule
To
XCTest\usr\lib\swift\windows\XCTest.swiftmodule

This allows us to use the same include path on all architectures and matches other standard modules. SPM was previously updated accordingly here: swiftlang/swift-package-manager#4300 but the related #119 did not update the paths for XCTest.

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

This breaks the installer, please test the change locally. The directory structure is needed as the import library will be installed there.

@tristanlabelle tristanlabelle requested a review from compnerd March 8, 2023 19:54
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Need to test this, but the change itself should be good to do.

compnerd added a commit to compnerd/apple-swift that referenced this pull request Mar 8, 2023
@compnerd compnerd merged commit 66ca213 into swiftlang:main Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants