-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Tests: repair the Generation tests on Windows #6354
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
+72
−7
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,45 @@ import XCTest | |
|
|
||
| import SwiftLintFramework | ||
|
|
||
| #if os(Windows) | ||
| private struct PlatformInfo { | ||
| struct DefaultProperties { | ||
| let versionXCTest: String | ||
| let versionSwiftTesting: String | ||
| let swiftFlags: [String]? | ||
| } | ||
|
|
||
| let defaults: DefaultProperties | ||
| } | ||
|
|
||
| extension PlatformInfo.DefaultProperties: Decodable { | ||
| enum CodingKeys: String, CodingKey { | ||
| case versionXCTest = "XCTEST_VERSION" | ||
| case versionSwiftTesting = "SWIFT_TESTING_VERSION" | ||
| case swiftFlags = "SWIFTC_FLAGS" | ||
| } | ||
| } | ||
|
|
||
| extension PlatformInfo: Decodable { | ||
| enum CodingKeys: String, CodingKey { | ||
| case defaults = "DefaultProperties" | ||
| } | ||
| } | ||
|
|
||
| private let info: PlatformInfo = { | ||
| let sdk = URL(fileURLWithPath: sdkPath(), isDirectory: true) | ||
| .deletingLastPathComponent() | ||
| .deletingLastPathComponent() | ||
| .deletingLastPathComponent() | ||
| .appendingPathComponent("Info.plist") | ||
| guard let data = try? Data(contentsOf: sdk), | ||
| let info = try? PropertyListDecoder().decode(PlatformInfo.self, from: data) else { | ||
| fatalError("invalid platform SDK - couldn't decode \(sdk.path)") | ||
| } | ||
| return info | ||
| }() | ||
| #endif | ||
|
|
||
| // swiftlint:disable file_length | ||
|
|
||
| private let violationMarker = "↓" | ||
|
|
@@ -28,12 +67,29 @@ private extension SwiftLintFile { | |
| .appendingPathComponent("Library") | ||
| .appendingPathComponent("Frameworks") | ||
| .path | ||
| return [ | ||
| "-F", | ||
| frameworks, | ||
|
|
||
| let arguments = [ | ||
| "-F", frameworks, | ||
| "-sdk", sdk, | ||
| "-j4", path!, | ||
| "-Xfrontend", "-enable-objc-interop", | ||
| "-j4", | ||
| path!, | ||
| ] | ||
| #if os(Windows) | ||
| let XCTestPath = URL(fileURLWithPath: sdk, isDirectory: true) | ||
| .deletingLastPathComponent() | ||
| .deletingLastPathComponent() | ||
| .appendingPathComponent("Library") | ||
| .appendingPathComponent("XCTest-\(info.defaults.versionXCTest)") | ||
| .appendingPathComponent("usr") | ||
| .appendingPathComponent("lib") | ||
| .appendingPathComponent("swift") | ||
| .appendingPathComponent("windows") | ||
| .path | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to use |
||
| return ["-I", XCTestPath] + arguments | ||
| #else | ||
| return arguments | ||
| #endif | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -265,6 +321,11 @@ private func testCorrection(_ correction: (Example, Example), | |
| guard correction.0.testOnLinux else { | ||
| return | ||
| } | ||
| #endif | ||
| #if os(Windows) | ||
| guard correction.0.testOnWindows else { | ||
| return | ||
| } | ||
| #endif | ||
| var config = configuration | ||
| if let correctionConfiguration = correction.0.configuration, | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could use
here which directly interacts with SourceKit to retrieve the version. Not sure whether it's safe to assume that Swift version == XCTest version, though. For the 6.2.1 toolchain, that's the case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that is entirely safe to assume (though it does currently hold). That is the reason for the deserialisation of the plist - it encodes the information for the SDK itself which is embedded at build time.