Skip to content

Commit d805caf

Browse files
committed
Fix NIO build on the CI now that strict concurrency has been turned on
Also, update mac-only test revert for upstream change.
1 parent e8375df commit d805caf

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

swift-nio-filesystem.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ index 3dc51872..49aeeeca 100644
1111
// When opening in this mode we can more "atomically" create the file, that is, by not
1212
// leaving the user with a half written file should e.g. the system crash or throw an
1313
// error while writing. On non-Android Linux we do this by opening the directory for
14+
diff --git a/Sources/NIOPerformanceTester/main.swift b/Sources/NIOPerformanceTester/main.swift
15+
index b3c2840a..809f114e 100644
16+
--- a/Sources/NIOPerformanceTester/main.swift
17+
+++ b/Sources/NIOPerformanceTester/main.swift
18+
@@ -32,7 +32,7 @@ import NIOPosix
19+
import NIOWebSocket
20+
21+
// Use unbuffered stdout to help detect exactly which test was running in the event of a crash.
22+
-setbuf(stdout, nil)
23+
+//setbuf(stdout, nil)
24+
25+
// MARK: Test Harness
26+
1427
diff --git a/Tests/NIOFSIntegrationTests/BufferedReaderTests.swift b/Tests/NIOFSIntegrationTests/BufferedReaderTests.swift
1528
index 8404e159..151fccc1 100644
1629
--- a/Tests/NIOFSIntegrationTests/BufferedReaderTests.swift

swift-nio-revert.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ index 65bbc653..93a5a700 100644
2525
--- a/Tests/NIOPosixTests/EventLoopTest.swift
2626
+++ b/Tests/NIOPosixTests/EventLoopTest.swift
2727
@@ -2070,6 +2070,40 @@ final class EventLoopTest: XCTestCase {
28+
}
2829
XCTAssertEqual("cool", actual)
2930
}
30-
#endif
3131
+
3232
+ func testRegressionSelectableEventLoopDeadlock() throws {
3333
+ let iterations = 1_000

0 commit comments

Comments
 (0)