Merge pull request #2558 from spevans/pr_darwin_compatibility2

spevans · web-flow · commit da19586f636f · 2019-11-12T11:54:40.000Z
DarwinCompatibilty: Add shims for missing FileHandle methods
diff --git a/DarwinCompatibilityTests.xcodeproj/project.pbxproj b/DarwinCompatibilityTests.xcodeproj/project.pbxproj
@@ -126,6 +126,7 @@
 		B9C89FCC1F6DCAEB00087AF4 /* NSKeyedUnarchiver-NotificationTest.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB71F6DCAEB00087AF4 /* NSKeyedUnarchiver-NotificationTest.plist */; };
 		B9C89FCD1F6DCAEB00087AF4 /* PropertyList-1.0.dtd in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB81F6DCAEB00087AF4 /* PropertyList-1.0.dtd */; };
 		B9C89FCE1F6DCAEB00087AF4 /* Test.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB91F6DCAEB00087AF4 /* Test.plist */; };
+		B9ED84FD23641F7000A58AF2 /* DarwinShims.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F3269E1FC714DD003C3599 /* DarwinShims.swift */; };
 		B9F137A120B998D0000B7577 /* xdgTestHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B917D31C20B0DB8B00728EE0 /* xdgTestHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		B9F326A01FC714DD003C3599 /* DarwinShims.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F3269E1FC714DD003C3599 /* DarwinShims.swift */; };
 		DAE7D0F320D8224200DC6C54 /* TestURLProtectionSpace.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAE7D0F220D8224200DC6C54 /* TestURLProtectionSpace.swift */; };
@@ -605,6 +606,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B917D32620B0DE2000728EE0 /* main.swift in Sources */,
+				B9ED84FD23641F7000A58AF2 /* DarwinShims.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -727,7 +729,7 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CODE_SIGN_STYLE = Automatic;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_RUNTIME_OBJC -DDARWIN_COMPATIBILITY_TESTS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -741,7 +743,7 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CODE_SIGN_STYLE = Automatic;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_RUNTIME_OBJC -DDARWIN_COMPATIBILITY_TESTS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -796,7 +798,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -847,7 +849,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -861,7 +863,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = DarwinCompatibilityTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-DDEPLOYMENT_RUNTIME_OBJC -DDARWIN_COMPATIBILITY_TESTS";
 				PRODUCT_BUNDLE_IDENTIFIER = org.swift.DarwinCompatibilityTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -876,7 +878,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = DarwinCompatibilityTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-DDEPLOYMENT_RUNTIME_OBJC -DDARWIN_COMPATIBILITY_TESTS";
 				PRODUCT_BUNDLE_IDENTIFIER = org.swift.DarwinCompatibilityTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/DarwinCompatibilityTests.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme b/DarwinCompatibilityTests.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme
@@ -50,12 +50,6 @@
                <Test
                   Identifier = "TestDateComponents/test_hash()">
                </Test>
-               <Test
-                  Identifier = "TestFileHandle">
-               </Test>
-               <Test
-                  Identifier = "TestPipe">
-               </Test>
                <Test
                   Identifier = "TestURLComponents/test_hash()">
                </Test>
diff --git a/DarwinCompatibilityTests/DarwinShims.swift b/DarwinCompatibilityTests/DarwinShims.swift
@@ -83,3 +83,27 @@ extension NSCharacterSet {
         return self as CharacterSet
     }
 }
+
+
+extension FileHandle {
+    public func offset() throws -> UInt64 {
+        return self.offsetInFile
+    }
+
+    public func read(upToCount count: Int) throws -> Data? {
+        guard count > 0 else { return nil }
+        let data = readData(ofLength: count)
+        if data.count == 0 { return nil }
+        return data
+    }
+
+    public func readToEnd() throws -> Data? {
+        try read(upToCount: Int.max)
+    }
+
+    public func write<T: DataProtocol>(contentsOf data: T) throws {
+        if let d = data as? Data {
+            self.write(d)
+        }
+    }
+}
diff --git a/TestFoundation/TestFileHandle.swift b/TestFoundation/TestFileHandle.swift
@@ -7,7 +7,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-#if !DARWIN_COMPATIBILITY_TESTS // Disable until Foundation has the new FileHandle API
 
 #if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
     #if canImport(SwiftFoundation) && !DEPLOYMENT_RUNTIME_OBJC
@@ -565,5 +564,3 @@ class TestFileHandle : XCTestCase {
         return tests
     }
 }
-
-#endif
diff --git a/TestFoundation/TestPipe.swift b/TestFoundation/TestPipe.swift
@@ -7,7 +7,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-#if !DARWIN_COMPATIBILITY_TESTS     // Disable until Foundation has the new FileHandle API
 
 #if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
     #if canImport(SwiftFoundation) && !DEPLOYMENT_RUNTIME_OBJC
@@ -79,4 +78,3 @@ class TestPipe: XCTestCase {
         XCTAssertEqual(text, convertedData)
     }
 }
-#endif
diff --git a/TestFoundation/TestProcess.swift b/TestFoundation/TestProcess.swift
@@ -84,11 +84,7 @@ class TestProcess : XCTestCase {
         try process.run()
         let msg = try XCTUnwrap("Hello, 🐶.\n".data(using: .utf8))
         do {
-#if DARWIN_COMPATIBILITY_TESTS
-            inputPipe.fileHandleForWriting.write(msg)
-#else
             try inputPipe.fileHandleForWriting.write(contentsOf: msg)
-#endif
         } catch {
             XCTFail("Cant write to pipe: \(error)")
             return
@@ -585,14 +581,9 @@ class TestProcess : XCTestCase {
         stdoutPipe.fileHandleForReading.readabilityHandler = nil
 
         try dataLock.synchronized {
-#if DARWIN_COMPATIBILITY_TESTS
-            // Use old API for now
-            stdoutData.append(stdoutPipe.fileHandleForReading.availableData)
-#else
             if let d = try stdoutPipe.fileHandleForReading.readToEnd() {
                 stdoutData.append(d)
             }
-#endif
             XCTAssertEqual(String(data: stdoutData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines), "No files specified.")
         }
     }
@@ -672,14 +663,9 @@ class TestProcess : XCTestCase {
             }
 
             var stdoutData = Data()
-            #if DARWIN_COMPATIBILITY_TESTS
-                    // Use old API for now
-                    stdoutData.append(stdoutPipe.fileHandleForReading.availableData)
-            #else
-                    if let d = try stdoutPipe.fileHandleForReading.readToEnd() {
-                        stdoutData.append(d)
-                    }
-            #endif
+            if let d = try stdoutPipe.fileHandleForReading.readToEnd() {
+                stdoutData.append(d)
+            }
 
             guard let stdout = String(data: stdoutData, encoding: .utf8) else {
                 throw Error.UnicodeDecodingError(stdoutData)
@@ -948,19 +934,13 @@ internal func runTask(_ arguments: [String], environment: [String: String]? = ni
 
     return try dataLock.synchronized {
         // Drain any data remaining in the pipes
-#if DARWIN_COMPATIBILITY_TESTS
-        // Use old API for now
-        stdoutData.append(stdoutPipe.fileHandleForReading.availableData)
-        stderrData.append(stderrPipe.fileHandleForReading.availableData)
-#else
         if let d = try stdoutPipe.fileHandleForReading.readToEnd() {
             stdoutData.append(d)
         }
 
         if let d = try stderrPipe.fileHandleForReading.readToEnd() {
             stderrData.append(d)
         }
-#endif
 
         guard let stdout = String(data: stdoutData, encoding: .utf8) else {
             throw Error.UnicodeDecodingError(stdoutData)
diff --git a/TestFoundation/TestScanner.swift b/TestFoundation/TestScanner.swift
@@ -7,8 +7,6 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-#if !DARWIN_COMPATIBILITY_TESTS     // Disable until Foundation has the new Scanner API
-
 fileprivate func withScanner(for string: String, invoking block: ((Scanner) throws -> Void)? = nil) rethrows {
     let scanner = Scanner(string: string)
     scanner.locale = Locale(identifier: "en_US_POSIX")
@@ -528,5 +526,3 @@ class TestScanner : XCTestCase {
         ]
     }
 }
-
-#endif
diff --git a/TestFoundation/Utilities.swift b/TestFoundation/Utilities.swift
@@ -528,11 +528,7 @@ private var shouldRunXFailTests: Bool {
 
 
 private func printStderr(_ msg: String) {
-#if DARWIN_COMPATIBILITY_TESTS
-    FileHandle.standardError.write(Data(msg.utf8))
-#else
     try? FileHandle.standardError.write(contentsOf: Data(msg.utf8))
-#endif
 }
 
 func shouldAttemptXFailTests(_ reason: String) -> Bool {
diff --git a/TestFoundation/xdgTestHelper/main.swift b/TestFoundation/xdgTestHelper/main.swift
@@ -180,19 +180,9 @@ func cat(_ args: ArraySlice<String>.Iterator) {
                 exitCode = 1
                 return
             }
- #if DARWIN_COMPATIBILITY_TESTS
-            var data: Data
-            repeat {
-                data = fh.readData(ofLength: Int.max)
-                if data.count > 0 {
-                    FileHandle.standardOutput.write(data)
-                }
-            } while data.count > 0
-#else
             while let data = try fh.readToEnd() {
                 try FileHandle.standardOutput.write(contentsOf: data)
             }
-#endif
         }
         catch { print(error) }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors`
`8`	`8`	`//`
`9`	`9`
`10`		`-#if !DARWIN_COMPATIBILITY_TESTS // Disable until Foundation has the new FileHandle API`
`11`	`10`
`12`	`11`	`#if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT`
`13`	`12`	`#if canImport(SwiftFoundation) && !DEPLOYMENT_RUNTIME_OBJC`
`@@ -565,5 +564,3 @@ class TestFileHandle : XCTestCase {`
`565`	`564`	`return tests`
`566`	`565`	`}`
`567`	`566`	`}`
`568`		`-`
`569`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors`
`8`	`8`	`//`
`9`	`9`
`10`		`-#if !DARWIN_COMPATIBILITY_TESTS // Disable until Foundation has the new Scanner API`
`11`		`-`
`12`	`10`	`fileprivate func withScanner(for string: String, invoking block: ((Scanner) throws -> Void)? = nil) rethrows {`
`13`	`11`	`let scanner = Scanner(string: string)`
`14`	`12`	`scanner.locale = Locale(identifier: "en_US_POSIX")`
`@@ -528,5 +526,3 @@ class TestScanner : XCTestCase {`
`528`	`526`	`]`
`529`	`527`	`}`
`530`	`528`	`}`
`531`		`-`
`532`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -528,11 +528,7 @@ private var shouldRunXFailTests: Bool {`
`528`	`528`
`529`	`529`
`530`	`530`	`private func printStderr(_ msg: String) {`
`531`		`-#if DARWIN_COMPATIBILITY_TESTS`
`532`		`- FileHandle.standardError.write(Data(msg.utf8))`
`533`		`-#else`
`534`	`531`	`try? FileHandle.standardError.write(contentsOf: Data(msg.utf8))`
`535`		`-#endif`
`536`	`532`	`}`
`537`	`533`
`538`	`534`	`func shouldAttemptXFailTests(_ reason: String) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -180,19 +180,9 @@ func cat(_ args: ArraySlice<String>.Iterator) {`
`180`	`180`	`exitCode = 1`
`181`	`181`	`return`
`182`	`182`	`}`
`183`		`- #if DARWIN_COMPATIBILITY_TESTS`
`184`		`- var data: Data`
`185`		`- repeat {`
`186`		`- data = fh.readData(ofLength: Int.max)`
`187`		`- if data.count > 0 {`
`188`		`- FileHandle.standardOutput.write(data)`
`189`		`- }`
`190`		`- } while data.count > 0`
`191`		`-#else`
`192`	`183`	`while let data = try fh.readToEnd() {`
`193`	`184`	`try FileHandle.standardOutput.write(contentsOf: data)`
`194`	`185`	`}`
`195`		`-#endif`
`196`	`186`	`}`
`197`	`187`	`catch { print(error) }`
`198`	`188`	`}`