Skip to content

Fix a couple testing paths on Windows #1995

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.

Sign up for GitHub

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 2 commits into from
Feb 26, 2025
Merged

Fix a couple testing paths on Windows #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8528c9
Fix a couple testing paths on Windows
bnbarham Feb 24, 2025
b5a96fa
Temporarily skip macro tests on Windows
bnbarham Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Sources/SKTestSupport/SkipUnless.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ package actor SkipUnless {
file: StaticString = #filePath,
line: UInt = #line
) async throws {
try XCTSkipUnless(
Platform.current != .windows,
"Temporarily skipping as we need to fix these tests to use the cmake-built swift-syntax libraries on Windows."
)

return try await shared.skipUnlessSupported(file: file, line: line) {
do {
let project = try await SwiftPMTestProject(
Expand Down
4 changes: 2 additions & 2 deletions Sources/SKTestSupport/SwiftPMTestProject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ package class SwiftPMTestProject: MultiFileTestProject {
.macro(
name: "MyMacros",
swiftSettings: [.unsafeFlags([
"-I", "\(moduleSearchPath)",
"-Xcc", "-fmodule-map-file=\(try swiftSyntaxCShimsModulemap.filePath)"
"-I", #"\(moduleSearchPath)"#,
"-Xcc", #"-fmodule-map-file=\(try swiftSyntaxCShimsModulemap.filePath)"#
])],
linkerSettings: [
.unsafeFlags([
Expand Down