Skip to content

Commit 0446827

Browse files
bkhouribkhouri
committed
FIRST COMMIT: Skip some tests on windows
1 parent 91b6163 commit 0446827

27 files changed

+3572
-23
lines changed

‎Sources/_InternalTestSupport/XCTSkipHelpers.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ import XCTest
1717
import class Basics.AsyncProcess
1818
import struct TSCBasic.StringError
1919

20+
public func skipOnWindowsAsTestCurrentlyFails(because reason: String? = nil) throws {
21+
#if os(Windows)
22+
let failureCause: String
23+
if reason == nil {
24+
failureCause = ""
25+
} else {
26+
failureCause = " because \(reason!.description)"
27+
}
28+
throw XCTSkip("Test fails on windows\(failureCause)")
29+
#endif
30+
}
31+
2032
extension Toolchain {
2133
package func skipUnlessAtLeastSwift6(
2234
file: StaticString = #file,

‎Tests/BasicsTests/AsyncProcessTests.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ import func TSCBasic.withTemporaryFile
2323
import func TSCTestSupport.withCustomEnv
2424

2525
final class AsyncProcessTests: XCTestCase {
26+
27+
override func setUp() async throws {
28+
try skipOnWindowsAsTestCurrentlyFails()
29+
}
30+
2631
func testBasics() throws {
2732
do {
2833
let process = AsyncProcess(args: "echo", "hello")

‎Tests/BasicsTests/ConcurrencyHelpersTests.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@
1414
import TSCTestSupport
1515
import XCTest
1616

17+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
18+
1719
final class ConcurrencyHelpersTest: XCTestCase {
1820
let queue = DispatchQueue(label: "ConcurrencyHelpersTest", attributes: .concurrent)
1921

22+
override func setUpWithError() throws {
23+
try skipOnWindowsAsTestCurrentlyFails()
24+
}
25+
2026
func testThreadSafeKeyValueStore() {
2127
for _ in 0 ..< 100 {
2228
let sync = DispatchGroup()

‎Tests/BasicsTests/Environment/EnvironmentTests.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import Basics
1616

1717
import XCTest
18+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails()
1819

1920
final class EnvironmentTests: XCTestCase {
2021
func test_init() {
@@ -35,10 +36,11 @@ final class EnvironmentTests: XCTestCase {
3536
"testKey": "TestValue2",
3637
]
3738
let environment = Environment(dictionary)
38-
XCTAssertEqual(environment["TestKey"], "TestValue")
3939
#if os(Windows)
40+
XCTAssertEqual(environment["TestKey"], "TestValue2")
4041
XCTAssertEqual(environment.count, 1)
4142
#else
43+
XCTAssertEqual(environment["TestKey"], "TestValue")
4244
XCTAssertEqual(environment.count, 2)
4345
#endif
4446
}
@@ -47,6 +49,7 @@ final class EnvironmentTests: XCTestCase {
4749
let dictionary = ["TestKey": "TestValue"]
4850
let environment = Environment(dictionary)
4951
XCTAssertEqual(environment["TestKey"], "TestValue")
52+
XCTAssertEqual(environment.count, 1)
5053
}
5154

5255
func path(_ components: String...) -> String {
@@ -99,10 +102,13 @@ final class EnvironmentTests: XCTestCase {
99102

100103
/// Important: This test is inherently race-prone, if it is proven to be
101104
/// flaky, it should run in a singled threaded environment/removed entirely.
102-
func test_current() {
105+
func test_current() throws {
106+
try skipOnWindowsAsTestCurrentlyFails(because: "ProcessInfo.processInfo.environment[\"PATH\"] return nil")
107+
103108
XCTAssertEqual(
104109
Environment.current["PATH"],
105-
ProcessInfo.processInfo.environment["PATH"])
110+
ProcessInfo.processInfo.environment["PATH"]
111+
)
106112
}
107113

108114
/// Important: This test is inherently race-prone, if it is proven to be

‎Tests/BasicsTests/FileSystem/PathTests.swift

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import Basics
1212
import Foundation
1313
import XCTest
1414

15+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails()
16+
1517
#if os(Windows)
1618
private var windows: Bool { true }
1719
#else
@@ -54,28 +56,36 @@ class PathTests: XCTestCase {
5456
XCTAssertEqual(rel2.pathString, "~") // `~` is not special
5557
}
5658

57-
func testRepeatedPathSeparators() {
59+
func testRepeatedPathSeparators() throws {
60+
try skipOnWindowsAsTestCurrentlyFails(because: "all assertions fail")
61+
5862
XCTAssertEqual(AbsolutePath("/ab//cd//ef").pathString, windows ? #"\ab\cd\ef"# : "/ab/cd/ef")
5963
XCTAssertEqual(AbsolutePath("/ab///cd//ef").pathString, windows ? #"\ab\cd\ef"# : "/ab/cd/ef")
6064
XCTAssertEqual(RelativePath("ab//cd//ef").pathString, windows ? #"ab\cd\ef"# : "ab/cd/ef")
6165
XCTAssertEqual(RelativePath("ab//cd///ef").pathString, windows ? #"ab\cd\ef"# : "ab/cd/ef")
6266
}
6367

64-
func testTrailingPathSeparators() {
68+
func testTrailingPathSeparators() throws {
69+
try skipOnWindowsAsTestCurrentlyFails(because: "trailing path seperator is not removed from pathString")
70+
6571
XCTAssertEqual(AbsolutePath("/ab/cd/ef/").pathString, windows ? #"\ab\cd\ef"# : "/ab/cd/ef")
6672
XCTAssertEqual(AbsolutePath("/ab/cd/ef//").pathString, windows ? #"\ab\cd\ef"# : "/ab/cd/ef")
6773
XCTAssertEqual(RelativePath("ab/cd/ef/").pathString, windows ? #"ab\cd\ef"# : "ab/cd/ef")
6874
XCTAssertEqual(RelativePath("ab/cd/ef//").pathString, windows ? #"ab\cd\ef"# : "ab/cd/ef")
6975
}
7076

71-
func testDotPathComponents() {
77+
func testDotPathComponents() throws {
78+
try skipOnWindowsAsTestCurrentlyFails()
79+
7280
XCTAssertEqual(AbsolutePath("/ab/././cd//ef").pathString, "/ab/cd/ef")
7381
XCTAssertEqual(AbsolutePath("/ab/./cd//ef/.").pathString, "/ab/cd/ef")
7482
XCTAssertEqual(RelativePath("ab/./cd/././ef").pathString, "ab/cd/ef")
7583
XCTAssertEqual(RelativePath("ab/./cd/ef/.").pathString, "ab/cd/ef")
7684
}
7785

78-
func testDotDotPathComponents() {
86+
func testDotDotPathComponents() throws {
87+
try skipOnWindowsAsTestCurrentlyFails()
88+
7989
XCTAssertEqual(AbsolutePath("/..").pathString, windows ? #"\"# : "/")
8090
XCTAssertEqual(AbsolutePath("/../../../../..").pathString, windows ? #"\"# : "/")
8191
XCTAssertEqual(AbsolutePath("/abc/..").pathString, windows ? #"\"# : "/")
@@ -91,7 +101,9 @@ class PathTests: XCTestCase {
91101
XCTAssertEqual(RelativePath("abc/..").pathString, ".")
92102
}
93103

94-
func testCombinationsAndEdgeCases() {
104+
func testCombinationsAndEdgeCases() throws {
105+
try skipOnWindowsAsTestCurrentlyFails()
106+
95107
XCTAssertEqual(AbsolutePath("///").pathString, windows ? #"\"# : "/")
96108
XCTAssertEqual(AbsolutePath("/./").pathString, windows ? #"\"# : "/")
97109
XCTAssertEqual(RelativePath("").pathString, ".")
@@ -120,7 +132,9 @@ class PathTests: XCTestCase {
120132
XCTAssertEqual(RelativePath("a/../////../////./////").pathString, "..")
121133
}
122134

123-
func testDirectoryNameExtraction() {
135+
func testDirectoryNameExtraction() throws {
136+
try skipOnWindowsAsTestCurrentlyFails()
137+
124138
XCTAssertEqual(AbsolutePath("/").dirname, windows ? #"\"# : "/")
125139
XCTAssertEqual(AbsolutePath("/a").dirname, windows ? #"\"# : "/")
126140
XCTAssertEqual(AbsolutePath("/./a").dirname, windows ? #"\"# : "/")
@@ -137,7 +151,9 @@ class PathTests: XCTestCase {
137151
XCTAssertEqual(RelativePath(".").dirname, ".")
138152
}
139153

140-
func testBaseNameExtraction() {
154+
func testBaseNameExtraction() throws {
155+
try skipOnWindowsAsTestCurrentlyFails()
156+
141157
XCTAssertEqual(AbsolutePath("/").basename, windows ? #"\"# : "/")
142158
XCTAssertEqual(AbsolutePath("/a").basename, "a")
143159
XCTAssertEqual(AbsolutePath("/./a").basename, "a")
@@ -153,7 +169,9 @@ class PathTests: XCTestCase {
153169
XCTAssertEqual(RelativePath(".").basename, ".")
154170
}
155171

156-
func testBaseNameWithoutExt() {
172+
func testBaseNameWithoutExt() throws{
173+
try skipOnWindowsAsTestCurrentlyFails()
174+
157175
XCTAssertEqual(AbsolutePath("/").basenameWithoutExt, windows ? #"\"# : "/")
158176
XCTAssertEqual(AbsolutePath("/a").basenameWithoutExt, "a")
159177
XCTAssertEqual(AbsolutePath("/./a").basenameWithoutExt, "a")
@@ -176,7 +194,9 @@ class PathTests: XCTestCase {
176194
XCTAssertEqual(RelativePath("abc.xyz.123").basenameWithoutExt, "abc.xyz")
177195
}
178196

179-
func testSuffixExtraction() {
197+
func testSuffixExtraction() throws {
198+
try skipOnWindowsAsTestCurrentlyFails(because: "expected nil is not the actual")
199+
180200
XCTAssertEqual(RelativePath("a").suffix, nil)
181201
XCTAssertEqual(RelativePath("a").extension, nil)
182202
XCTAssertEqual(RelativePath("a.").suffix, nil)
@@ -201,7 +221,9 @@ class PathTests: XCTestCase {
201221
XCTAssertEqual(RelativePath(".a.foo.bar.baz").extension, "baz")
202222
}
203223

204-
func testParentDirectory() {
224+
func testParentDirectory() throws {
225+
try skipOnWindowsAsTestCurrentlyFails()
226+
205227
XCTAssertEqual(AbsolutePath("/").parentDirectory, AbsolutePath("/"))
206228
XCTAssertEqual(AbsolutePath("/").parentDirectory.parentDirectory, AbsolutePath("/"))
207229
XCTAssertEqual(AbsolutePath("/bar").parentDirectory, AbsolutePath("/"))
@@ -210,7 +232,9 @@ class PathTests: XCTestCase {
210232
}
211233

212234
@available(*, deprecated)
213-
func testConcatenation() {
235+
func testConcatenation() throws {
236+
try skipOnWindowsAsTestCurrentlyFails()
237+
214238
XCTAssertEqual(AbsolutePath(AbsolutePath("/"), RelativePath("")).pathString, windows ? #"\"# : "/")
215239
XCTAssertEqual(AbsolutePath(AbsolutePath("/"), RelativePath(".")).pathString, windows ? #"\"# : "/")
216240
XCTAssertEqual(AbsolutePath(AbsolutePath("/"), RelativePath("..")).pathString, windows ? #"\"# : "/")
@@ -247,7 +271,9 @@ class PathTests: XCTestCase {
247271
XCTAssertEqual(RelativePath("hello").appending(RelativePath("a/b/../c/d")).pathString, windows ? #"hello\a\c\d"# : "hello/a/c/d")
248272
}
249273

250-
func testPathComponents() {
274+
func testPathComponents() throws {
275+
try skipOnWindowsAsTestCurrentlyFails()
276+
251277
XCTAssertEqual(AbsolutePath("/").components, ["/"])
252278
XCTAssertEqual(AbsolutePath("/.").components, ["/"])
253279
XCTAssertEqual(AbsolutePath("/..").components, ["/"])
@@ -275,7 +301,9 @@ class PathTests: XCTestCase {
275301
XCTAssertEqual(RelativePath("abc").components, ["abc"])
276302
}
277303

278-
func testRelativePathFromAbsolutePaths() {
304+
func testRelativePathFromAbsolutePaths() throws {
305+
try skipOnWindowsAsTestCurrentlyFails()
306+
279307
XCTAssertEqual(AbsolutePath("/").relative(to: AbsolutePath("/")), RelativePath("."));
280308
XCTAssertEqual(AbsolutePath("/a/b/c/d").relative(to: AbsolutePath("/")), RelativePath("a/b/c/d"));
281309
XCTAssertEqual(AbsolutePath("/").relative(to: AbsolutePath("/a/b/c")), RelativePath("../../.."));
@@ -316,7 +344,9 @@ class PathTests: XCTestCase {
316344
XCTAssertTrue(AbsolutePath("/foo").isAncestor(of: AbsolutePath("/foo/bar")))
317345
}
318346

319-
func testAbsolutePathValidation() {
347+
func testAbsolutePathValidation() throws {
348+
try skipOnWindowsAsTestCurrentlyFails()
349+
320350
XCTAssertNoThrow(try AbsolutePath(validating: "/a/b/c/d"))
321351

322352
XCTAssertThrowsError(try AbsolutePath(validating: "~/a/b/d")) { error in
@@ -328,7 +358,9 @@ class PathTests: XCTestCase {
328358
}
329359
}
330360

331-
func testRelativePathValidation() {
361+
func testRelativePathValidation() throws {
362+
try skipOnWindowsAsTestCurrentlyFails()
363+
332364
XCTAssertNoThrow(try RelativePath(validating: "a/b/c/d"))
333365

334366
XCTAssertThrowsError(try RelativePath(validating: "/a/b/d")) { error in
@@ -342,6 +374,8 @@ class PathTests: XCTestCase {
342374
}
343375

344376
func testCodable() throws {
377+
try skipOnWindowsAsTestCurrentlyFails()
378+
345379
struct Foo: Codable, Equatable {
346380
var path: AbsolutePath
347381
}

‎Tests/BasicsTests/FileSystem/VFSTests.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import XCTest
1616

1717
import struct TSCBasic.ByteString
1818

19+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
20+
1921
func testWithTemporaryDirectory(
2022
function: StaticString = #function,
2123
body: @escaping (AbsolutePath) async throws -> Void
@@ -36,6 +38,8 @@ func testWithTemporaryDirectory(
3638

3739
class VFSTests: XCTestCase {
3840
func testLocalBasics() throws {
41+
try skipOnWindowsAsTestCurrentlyFails()
42+
3943
// tiny PE binary from: https://archive.is/w01DO
4044
let contents: [UInt8] = [
4145
0x4d, 0x5a, 0x00, 0x00, 0x50, 0x45, 0x00, 0x00, 0x4c, 0x01, 0x01, 0x00,

‎Tests/BasicsTests/HTTPClientTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ final class HTTPClientTests: XCTestCase {
226226
}
227227

228228
func testExponentialBackoff() async throws {
229+
try skipOnWindowsAsTestCurrentlyFails()
230+
229231
let counter = SendableBox(0)
230232
let lastCall = SendableBox<Date>()
231233
let maxAttempts = 5

‎Tests/BasicsTests/Serialization/SerializedJSONTests.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212

1313
@testable import Basics
1414
import XCTest
15+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
1516

1617
final class SerializedJSONTests: XCTestCase {
1718
func testPathInterpolation() throws {
19+
try skipOnWindowsAsTestCurrentlyFails()
20+
1821
var path = try AbsolutePath(validating: #"/test\backslashes"#)
1922
var json: SerializedJSON = "\(path)"
2023

‎Tests/BuildTests/BuildPlanTests.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,6 +1999,8 @@ final class BuildPlanTests: XCTestCase {
19991999
}
20002000

20012001
func test_symbolGraphExtract_arguments() async throws {
2002+
try skipOnWindowsAsTestCurrentlyFails()
2003+
20022004
// ModuleGraph:
20032005
// .
20042006
// ├── A (Swift)
@@ -4619,6 +4621,8 @@ final class BuildPlanTests: XCTestCase {
46194621
}
46204622

46214623
func testUserToolchainCompileFlags() async throws {
4624+
try skipOnWindowsAsTestCurrentlyFails()
4625+
46224626
let fs = InMemoryFileSystem(
46234627
emptyFiles:
46244628
"/Pkg/Sources/exe/main.swift",
@@ -4882,6 +4886,8 @@ final class BuildPlanTests: XCTestCase {
48824886
}
48834887

48844888
func testUserToolchainWithToolsetCompileFlags() async throws {
4889+
try skipOnWindowsAsTestCurrentlyFails()
4890+
48854891
let fileSystem = InMemoryFileSystem(
48864892
emptyFiles:
48874893
"/Pkg/Sources/exe/main.swift",
@@ -5050,6 +5056,8 @@ final class BuildPlanTests: XCTestCase {
50505056
}
50515057

50525058
func testUserToolchainWithSDKSearchPaths() async throws {
5059+
try skipOnWindowsAsTestCurrentlyFails()
5060+
50535061
let fileSystem = InMemoryFileSystem(
50545062
emptyFiles:
50555063
"/Pkg/Sources/exe/main.swift",

‎Tests/BuildTests/BuildSystemDelegateTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ final class BuildSystemDelegateTests: XCTestCase {
3131
}
3232

3333
func testFilterNonFatalCodesignMessages() async throws {
34+
try skipOnWindowsAsTestCurrentlyFails()
35+
3436
try XCTSkipIf(!UserToolchain.default.supportsSDKDependentTests(), "skipping because test environment doesn't support this test")
3537
// Note: we can re-use the `TestableExe` fixture here since we just need an executable.
3638
try await fixture(name: "Miscellaneous/TestableExe") { fixturePath in

‎Tests/BuildTests/LLBuildManifestBuilderTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ final class LLBuildManifestBuilderTests: XCTestCase {
194194

195195
/// Verifies that two modules with the same name but different triples don't share same build manifest keys.
196196
func testToolsBuildTriple() async throws {
197+
try skipOnWindowsAsTestCurrentlyFails()
198+
197199
let (graph, fs, scope) = try macrosPackageGraph()
198200
let productsTriple = Triple.x86_64MacOS
199201
let toolsTriple = Triple.arm64Linux

‎Tests/BuildTests/PluginsBuildPlanTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import PackageModel
1818

1919
final class PluginsBuildPlanTests: XCTestCase {
2020
func testBuildToolsDatabasePath() async throws {
21+
try skipOnWindowsAsTestCurrentlyFails()
22+
2123
try await fixture(name: "Miscellaneous/Plugins/MySourceGenPlugin") { fixturePath in
2224
let (stdout, _) = try await executeSwiftBuild(fixturePath)
2325
XCTAssertMatch(stdout, .contains("Build complete!"))

0 commit comments

Comments
 (0)