Skip to content

Commit 0ad0aed

Browse files
bkhouribkhouri
committed
FIRST COMMIT: Enable all Windows tests and see which ones fails
Fixes: swiftlang#8433 Issue: rdar://148248105
1 parent 304833a commit 0ad0aed

27 files changed

+250
-250
lines changed

‎Sources/_InternalTestSupport/misc.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ public func executeSwiftBuild(
278278
}
279279

280280
public func skipOnWindowsAsTestCurrentlyFails(because reason: String? = nil) throws {
281-
#if os(Windows)
282-
let failureCause: String
283-
if let reason {
284-
failureCause = " because \(reason.description)"
285-
} else {
286-
failureCause = ""
287-
}
288-
throw XCTSkip("Test fails on windows\(failureCause)")
289-
#endif
281+
// #if os(Windows)
282+
// let failureCause: String
283+
// if let reason {
284+
// failureCause = " because \(reason.description)"
285+
// } else {
286+
// failureCause = ""
287+
// }
288+
// throw XCTSkip("Test fails on windows\(failureCause)")
289+
// #endif
290290
}
291291

292292
@discardableResult

‎Tests/BasicsTests/AsyncProcessTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import func TSCTestSupport.withCustomEnv
2525
final class AsyncProcessTests: XCTestCase {
2626

2727
override func setUp() async throws {
28-
try skipOnWindowsAsTestCurrentlyFails()
28+
try skipOnWindowsAsTestCurrentlyFailsDang()
2929
}
3030

3131
func testBasics() throws {

‎Tests/BasicsTests/ConcurrencyHelpersTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
import TSCTestSupport
1515
import XCTest
1616

17-
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
17+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFailsDang
1818

1919
final class ConcurrencyHelpersTest: XCTestCase {
2020
let queue = DispatchQueue(label: "ConcurrencyHelpersTest", attributes: .concurrent)
2121

2222
override func setUpWithError() throws {
23-
try skipOnWindowsAsTestCurrentlyFails()
23+
try skipOnWindowsAsTestCurrentlyFailsDang()
2424
}
2525

2626
func testThreadSafeKeyValueStore() {

‎Tests/BasicsTests/Environment/EnvironmentTests.swift

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

1717
import XCTest
18-
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails()
18+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFailsDang()
1919

2020
final class EnvironmentTests: XCTestCase {
2121
func test_init() {
@@ -103,7 +103,7 @@ final class EnvironmentTests: XCTestCase {
103103
/// Important: This test is inherently race-prone, if it is proven to be
104104
/// flaky, it should run in a singled threaded environment/removed entirely.
105105
func test_current() throws {
106-
try skipOnWindowsAsTestCurrentlyFails(because: "ProcessInfo.processInfo.environment[pathEnvVarName] return nil in the docker container")
106+
try skipOnWindowsAsTestCurrentlyFailsDang(because: "ProcessInfo.processInfo.environment[pathEnvVarName] return nil in the docker container")
107107

108108
#if os(Windows)
109109
let pathEnvVarName = "Path"

‎Tests/BasicsTests/FileSystem/VFSTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Testing
1717

1818
import struct TSCBasic.ByteString
1919

20-
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
20+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFailsDang
2121

2222
func testWithTemporaryDirectory(
2323
function: StaticString = #function,
@@ -39,7 +39,7 @@ func testWithTemporaryDirectory(
3939

4040
struct VFSTests {
4141
@Test(
42-
.skipHostOS(.windows)
42+
// .skipHostOS(.windows)
4343
)
4444
func localBasics() throws {
4545
// tiny PE binary from: https://archive.is/w01DO

‎Tests/BasicsTests/HTTPClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ final class HTTPClientTests: XCTestCase {
226226
}
227227

228228
func testExponentialBackoff() async throws {
229-
try skipOnWindowsAsTestCurrentlyFails()
229+
try skipOnWindowsAsTestCurrentlyFailsDang()
230230

231231
let counter = SendableBox(0)
232232
let lastCall = SendableBox<Date>()

‎Tests/BasicsTests/LegacyHTTPClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ final class LegacyHTTPClientTests: XCTestCase {
350350
}
351351

352352
func testExponentialBackoff() throws {
353-
try skipOnWindowsAsTestCurrentlyFails()
353+
try skipOnWindowsAsTestCurrentlyFailsDang()
354354

355355
let count = ThreadSafeBox<Int>(0)
356356
let lastCall = ThreadSafeBox<Date>()

‎Tests/BasicsTests/Serialization/SerializedJSONTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
@testable import Basics
1414
import XCTest
15-
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
15+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFailsDang
1616

1717
final class SerializedJSONTests: XCTestCase {
1818
func testPathInterpolation() throws {
19-
try skipOnWindowsAsTestCurrentlyFails()
19+
try skipOnWindowsAsTestCurrentlyFailsDang()
2020

2121
var path = try AbsolutePath(validating: #"/test\backslashes"#)
2222
var json: SerializedJSON = "\(path)"

‎Tests/BuildTests/BuildPlanTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,7 +2036,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
20362036
}
20372037

20382038
func test_symbolGraphExtract_arguments() async throws {
2039-
try skipOnWindowsAsTestCurrentlyFails()
2039+
try skipOnWindowsAsTestCurrentlyFailsDang()
20402040

20412041
// ModuleGraph:
20422042
// .
@@ -4691,7 +4691,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
46914691
}
46924692

46934693
func testUserToolchainCompileFlags() async throws {
4694-
try skipOnWindowsAsTestCurrentlyFails()
4694+
try skipOnWindowsAsTestCurrentlyFailsDang()
46954695

46964696
let fs = InMemoryFileSystem(
46974697
emptyFiles:
@@ -4945,7 +4945,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
49454945
}
49464946

49474947
func testUserToolchainWithToolsetCompileFlags() async throws {
4948-
try skipOnWindowsAsTestCurrentlyFails(because: "Path delimiters donw's work well on Windows")
4948+
try skipOnWindowsAsTestCurrentlyFailsDang(because: "Path delimiters donw's work well on Windows")
49494949

49504950
let fileSystem = InMemoryFileSystem(
49514951
emptyFiles:
@@ -5115,7 +5115,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
51155115
}
51165116

51175117
func testUserToolchainWithSDKSearchPaths() async throws {
5118-
try skipOnWindowsAsTestCurrentlyFails()
5118+
try skipOnWindowsAsTestCurrentlyFailsDang()
51195119

51205120
let fileSystem = InMemoryFileSystem(
51215121
emptyFiles:

‎Tests/BuildTests/BuildSystemDelegateTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class BuildSystemDelegateTests: XCTestCase {
3030
}
3131

3232
func testFilterNonFatalCodesignMessages() async throws {
33-
try skipOnWindowsAsTestCurrentlyFails()
33+
try skipOnWindowsAsTestCurrentlyFailsDang()
3434

3535
try XCTSkipIf(!UserToolchain.default.supportsSDKDependentTests(), "skipping because test environment doesn't support this test")
3636
// Note: we can re-use the `TestableExe` fixture here since we just need an executable.

‎Tests/BuildTests/LLBuildManifestBuilderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ final class LLBuildManifestBuilderTests: XCTestCase {
195195

196196
/// Verifies that two modules with the same name but different triples don't share same build manifest keys.
197197
func testToolsBuildTriple() async throws {
198-
try skipOnWindowsAsTestCurrentlyFails()
198+
try skipOnWindowsAsTestCurrentlyFailsDang()
199199

200200
let (graph, fs, scope) = try macrosPackageGraph()
201201
let productsTriple = Triple.x86_64MacOS

‎Tests/BuildTests/PluginsBuildPlanTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import PackageModel
1818

1919
final class PluginsBuildPlanTests: XCTestCase {
2020
func testBuildToolsDatabasePath() async throws {
21-
try skipOnWindowsAsTestCurrentlyFails()
21+
try skipOnWindowsAsTestCurrentlyFailsDang()
2222

2323
try await fixture(name: "Miscellaneous/Plugins/MySourceGenPlugin") { fixturePath in
2424
let (stdout, _) = try await executeSwiftBuild(fixturePath)

‎Tests/BuildTests/PrepareForIndexTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import struct PackageModel.TargetDescription
2626

2727
class PrepareForIndexTests: XCTestCase {
2828
func testPrepare() async throws {
29-
try skipOnWindowsAsTestCurrentlyFails()
29+
try skipOnWindowsAsTestCurrentlyFailsDang()
3030

3131
let (graph, fs, scope) = try macrosPackageGraph()
3232

@@ -96,7 +96,7 @@ class PrepareForIndexTests: XCTestCase {
9696

9797
// enable-testing requires the non-exportable-decls, make sure they aren't skipped.
9898
func testEnableTesting() async throws {
99-
try skipOnWindowsAsTestCurrentlyFails()
99+
try skipOnWindowsAsTestCurrentlyFailsDang()
100100

101101
let fs = InMemoryFileSystem(
102102
emptyFiles:
@@ -167,7 +167,7 @@ class PrepareForIndexTests: XCTestCase {
167167
}
168168

169169
func testPrepareNoLazy() async throws {
170-
try skipOnWindowsAsTestCurrentlyFails()
170+
try skipOnWindowsAsTestCurrentlyFailsDang()
171171

172172
let (graph, fs, scope) = try macrosPackageGraph()
173173

‎Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ final class PackageGraphPerfTests: XCTestCasePerf {
165165
}
166166

167167
func testRecursiveDependencies() throws {
168-
try skipOnWindowsAsTestCurrentlyFails()
168+
try skipOnWindowsAsTestCurrentlyFailsDang()
169169

170170
var resolvedTarget = ResolvedModule.mock(packageIdentity: "pkg", name: "t0")
171171
for i in 1..<1000 {

‎Tests/PackageGraphTests/ModulesGraphTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import struct TSCBasic.ByteString
2323

2424
final class ModulesGraphTests: XCTestCase {
2525
func testBasic() throws {
26-
try skipOnWindowsAsTestCurrentlyFails()
26+
try skipOnWindowsAsTestCurrentlyFailsDang()
2727
let fs = InMemoryFileSystem(
2828
emptyFiles:
2929
"/Foo/Sources/Foo/source.swift",

‎Tests/PackageLoadingTests/PackageBuilderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ final class PackageBuilderTests: XCTestCase {
564564
}
565565

566566
func testTestManifestSearch() throws {
567-
try skipOnWindowsAsTestCurrentlyFails()
567+
try skipOnWindowsAsTestCurrentlyFailsDang()
568568

569569
let fs = InMemoryFileSystem(emptyFiles:
570570
"/pkg/foo.swift",

‎Tests/PackageLoadingTests/PkgConfigParserTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import struct TSCBasic.ByteString
1919

2020
final class PkgConfigParserTests: XCTestCase {
2121
func testCircularPCFile() throws {
22-
try skipOnWindowsAsTestCurrentlyFails()
22+
try skipOnWindowsAsTestCurrentlyFailsDang()
2323

2424
let observability = ObservabilitySystem.makeForTesting()
2525

@@ -36,7 +36,7 @@ final class PkgConfigParserTests: XCTestCase {
3636
}
3737

3838
func testGTK3PCFile() throws {
39-
try skipOnWindowsAsTestCurrentlyFails()
39+
try skipOnWindowsAsTestCurrentlyFailsDang()
4040

4141
try! loadPCFile("gtk+-3.0.pc") { parser in
4242
XCTAssertEqual(parser.variables, [
@@ -58,7 +58,7 @@ final class PkgConfigParserTests: XCTestCase {
5858
}
5959

6060
func testEmptyCFlags() throws {
61-
try skipOnWindowsAsTestCurrentlyFails()
61+
try skipOnWindowsAsTestCurrentlyFailsDang()
6262

6363
try! loadPCFile("empty_cflags.pc") { parser in
6464
XCTAssertEqual(parser.variables, [
@@ -74,15 +74,15 @@ final class PkgConfigParserTests: XCTestCase {
7474
}
7575

7676
func testCFlagsCaseInsensitveKeys() throws {
77-
try skipOnWindowsAsTestCurrentlyFails()
77+
try skipOnWindowsAsTestCurrentlyFailsDang()
7878

7979
try! loadPCFile("case_insensitive.pc") { parser in
8080
XCTAssertEqual(parser.cFlags, ["-I/usr/local/include"])
8181
}
8282
}
8383

8484
func testVariableinDependency() throws {
85-
try skipOnWindowsAsTestCurrentlyFails()
85+
try skipOnWindowsAsTestCurrentlyFailsDang()
8686

8787
try! loadPCFile("deps_variable.pc") { parser in
8888
XCTAssertEqual(parser.variables, [
@@ -108,7 +108,7 @@ final class PkgConfigParserTests: XCTestCase {
108108
}
109109

110110
func testEscapedSpaces() throws {
111-
try skipOnWindowsAsTestCurrentlyFails()
111+
try skipOnWindowsAsTestCurrentlyFailsDang()
112112

113113
try! loadPCFile("escaped_spaces.pc") { parser in
114114
XCTAssertEqual(parser.variables, [
@@ -125,7 +125,7 @@ final class PkgConfigParserTests: XCTestCase {
125125
}
126126

127127
func testDummyDependency() throws {
128-
try skipOnWindowsAsTestCurrentlyFails()
128+
try skipOnWindowsAsTestCurrentlyFailsDang()
129129

130130
try loadPCFile("dummy_dependency.pc") { parser in
131131
XCTAssertEqual(parser.variables, [
@@ -213,7 +213,7 @@ final class PkgConfigParserTests: XCTestCase {
213213
}
214214

215215
func testAbsolutePathDependency() throws {
216-
try skipOnWindowsAsTestCurrentlyFails()
216+
try skipOnWindowsAsTestCurrentlyFailsDang()
217217

218218
let libffiPath = "/usr/local/opt/libffi/lib/pkgconfig/libffi.pc"
219219

@@ -248,7 +248,7 @@ final class PkgConfigParserTests: XCTestCase {
248248
}
249249

250250
func testUnevenQuotes() throws {
251-
try skipOnWindowsAsTestCurrentlyFails()
251+
try skipOnWindowsAsTestCurrentlyFailsDang()
252252

253253
do {
254254
try loadPCFile("quotes_failure.pc")
@@ -259,7 +259,7 @@ final class PkgConfigParserTests: XCTestCase {
259259
}
260260

261261
func testSysrootDir() throws {
262-
try skipOnWindowsAsTestCurrentlyFails()
262+
try skipOnWindowsAsTestCurrentlyFailsDang()
263263

264264
// sysroot should be prepended to all path variables, and should therefore appear in cflags and libs.
265265
try loadPCFile("gtk+-3.0.pc", sysrootDir: "/opt/sysroot/somewhere") { parser in

‎Tests/PackageLoadingTests/PkgConfigTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class PkgConfigTests: XCTestCase {
8787
}
8888

8989
func testEnvVar() throws {
90-
try skipOnWindowsAsTestCurrentlyFails()
90+
try skipOnWindowsAsTestCurrentlyFailsDang()
9191

9292
// Pc file.
9393
try Environment.makeCustom(["PKG_CONFIG_PATH": inputsDir.pathString]) {
@@ -152,7 +152,7 @@ class PkgConfigTests: XCTestCase {
152152
}
153153

154154
func testExplicitPkgConfigDirectories() throws {
155-
try skipOnWindowsAsTestCurrentlyFails()
155+
try skipOnWindowsAsTestCurrentlyFailsDang()
156156

157157
// Pc file.
158158
for result in try pkgConfigArgs(
@@ -212,7 +212,7 @@ class PkgConfigTests: XCTestCase {
212212
}
213213

214214
func testDependencies() throws {
215-
try skipOnWindowsAsTestCurrentlyFails()
215+
try skipOnWindowsAsTestCurrentlyFailsDang()
216216

217217
// Use additionalSearchPaths instead of pkgConfigArgs to test handling
218218
// of search paths when loading dependencies.

‎Tests/PackageModelTests/PackageModelTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Basics
1717

1818
import func TSCBasic.withTemporaryFile
1919
import XCTest
20-
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFails
20+
import _InternalTestSupport // for skipOnWindowsAsTestCurrentlyFailsDang
2121

2222
import struct TSCBasic.ByteString
2323

@@ -160,7 +160,7 @@ final class PackageModelTests: XCTestCase {
160160
}
161161

162162
func testDetermineSwiftCompilers() throws {
163-
try skipOnWindowsAsTestCurrentlyFails()
163+
try skipOnWindowsAsTestCurrentlyFailsDang()
164164

165165
let fs = localFileSystem
166166
try withTemporaryFile { _ in

‎Tests/QueryEngineTests/QueryEngineTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private struct Expression: CachingQuery {
100100

101101
final class QueryEngineTests: XCTestCase {
102102
func testFilePathHashing() throws {
103-
try skipOnWindowsAsTestCurrentlyFails()
103+
try skipOnWindowsAsTestCurrentlyFailsDang()
104104

105105
let path = "/root"
106106

0 commit comments

Comments
 (0)