Skip to content

Rename remaining occurrences of the old helper. #8583

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
Apr 30, 2025

Conversation

yyvch
Copy link
Contributor

@yyvch yyvch commented Apr 30, 2025

Rename remaining occurrences of the old helper.

Motivation:

My local test failed to build after #8569 with

…/Tests/WorkspaceTests/WorkspaceTests.swift:16148:13: error: cannot find 'skipOnWindowsAsTestCurrentlyFails' in scope
16146 | 
16147 |     func testInvalidTrait_WhenParentPackageEnablesTraits() async throws {
16148 |         try skipOnWindowsAsTestCurrentlyFails(because: #"\tmp\ws doesn't exist in file system"#)
      |             `- error: cannot find 'skipOnWindowsAsTestCurrentlyFails' in scope
16149 | 
16150 |         let sandbox = AbsolutePath("/tmp/ws/")

I checked, and it appears to be leftovers after #8569:

% rg skipOnWindowsAsTestCurrentlyFails
Tests/WorkspaceTests/WorkspaceTests.swift
16148:        try skipOnWindowsAsTestCurrentlyFails(because: #"\tmp\ws doesn't exist in file system"#)
16211:        try skipOnWindowsAsTestCurrentlyFails(because: #"\tmp\ws doesn't exist in file system"#)

Modifications:

Renamed skipOnWindowsAsTestCurrentlyFails to XCTSkipOnWindows.

Result:

Tests build and pass.

@yyvch
Copy link
Contributor Author

yyvch commented Apr 30, 2025

@swift-ci please test

@bkhouri
Copy link
Contributor

bkhouri commented Apr 30, 2025

I wonder how this was missed! Sorry for impacting you!

@yyvch
Copy link
Contributor Author

yyvch commented Apr 30, 2025

I wonder how this was missed!

Two in-flight PRs modifying the same file, pass individually but fail when merged:

@bnbarham
Copy link
Contributor

Merging to unblock PR testing

@bnbarham bnbarham merged commit bdfd754 into swiftlang:main Apr 30, 2025
3 of 6 checks passed
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