Skip to content

Tests: adjust the BuildPlanTests for Windows #6682

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
Aug 17, 2023

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Jul 7, 2023

The Windows toolchain does not find the default linker by default as
that requires the sourcing of Visual Studio's scripts to setup the
environment. Adjust the tests to explicitly specify the linker to
ensure that the toolchain is usable on Windows without constraint on the
environment. While in the area, adjust the expectations to account for
platform path spellings. This allows us to pass these tests on Windows
now.

Adjust the path representation to account for Windows to allow the
matching to succeed.

@compnerd
Copy link
Member Author

compnerd commented Jul 7, 2023

@swift-ci please smoke test

@compnerd compnerd force-pushed the planning-build-plans branch from 6648670 to 76942a6 Compare July 9, 2023 17:01
@compnerd compnerd changed the title Tests: make BuildPlanTests less reliant on the environment on Windows Tests: adjust the BuildPlanTests for Windows Jul 9, 2023
@compnerd
Copy link
Member Author

compnerd commented Jul 9, 2023

@swift-ci please smoke test

@compnerd
Copy link
Member Author

compnerd commented Jul 9, 2023

@swift-ci please test Windows platform

@compnerd compnerd force-pushed the planning-build-plans branch from 76942a6 to 4a50ede Compare July 11, 2023 00:19
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd compnerd force-pushed the planning-build-plans branch from 4a50ede to 132e306 Compare July 11, 2023 00:30
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd compnerd force-pushed the planning-build-plans branch from f6e32d1 to 0209644 Compare August 17, 2023 19:47
@compnerd
Copy link
Member Author

@swift-ci please smoke test

The Windows toolchain does not find the default linker by default as
that requires the sourcing of Visual Studio's scripts to setup the
environment.  Adjust the tests to explicitly specify the linker to
ensure that the toolchain is usable on Windows without constraint on the
environment.  While in the area, adjust the expectations to account for
platform path spellings.  This allows us to pass these tests on Windows
now.

Adjust the path representation to account for Windows to allow the
matching to succeed.
Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

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

Perfect, thank you! 👍

@compnerd compnerd force-pushed the planning-build-plans branch from 0209644 to 8228314 Compare August 17, 2023 19:48
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@MaxDesiatov
Copy link
Contributor

@swift-ci test windows

@compnerd compnerd merged commit 1826ef6 into swiftlang:main Aug 17, 2023
@compnerd compnerd deleted the planning-build-plans branch August 17, 2023 22:28
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.

3 participants