Merge pull request #5 from spevans/pr_linux_fix

Linux: Use a DispatchSourceRead instead of a FileHandle.readabilityHandler

Author: ahoppen

Sources/SwiftSyntax/SwiftcInvocation.swift

@@ -52,15 +52,21 @@ private func runCore(_ executable: URL, _ arguments: [String] = [])
     -> ProcessResult {
   let stdoutPipe = Pipe()
   var stdoutData = Data()
-  stdoutPipe.fileHandleForReading.readabilityHandler = { file in
-    stdoutData.append(file.availableData)
+  let stdoutSource = DispatchSource.makeReadSource(
+		fileDescriptor: stdoutPipe.fileHandleForReading.fileDescriptor)
+  stdoutSource.setEventHandler {
+    stdoutData.append(stdoutPipe.fileHandleForReading.availableData)
   }
+  stdoutSource.resume()
 
   let stderrPipe = Pipe()
   var stderrData = Data()
-  stderrPipe.fileHandleForReading.readabilityHandler = { file in
-    stderrData.append(file.availableData)
+  let stderrSource = DispatchSource.makeReadSource(
+		fileDescriptor: stderrPipe.fileHandleForReading.fileDescriptor)
+  stderrSource.setEventHandler {
+    stderrData.append(stderrPipe.fileHandleForReading.availableData)
   }
+  stderrSource.resume()
 
   let process = Process()
   process.launchPath = executable.path

Tests/LinuxMain.swift

@@ -0,0 +1,14 @@
+import XCTest
+import SwiftSyntaxTest
+
+XCTMain([
+  testCase(AbsolutePositionTestCase.allTests),
+  testCase(DecodeSyntaxTestCase.allTests),
+  testCase(DiagnosticTestCase.allTests),
+  testCase(LazyCachingTestCase.allTests),
+  testCase(ParseFileTestCase.allTests),
+  testCase(SyntaxChildrenAPITestCase.allTests),
+  testCase(SyntaxCollectionsAPITestCase.allTests),
+  testCase(SyntaxFactoryAPITestCase.allTests),
+  testCase(SyntaxVisitorTestCase.allTests),
+])

Tests/SwiftSyntaxTest/AbsolutePosition.swift

@@ -9,6 +9,18 @@ fileprivate class FuncRenamer: SyntaxRewriter {
 }
 
 public class AbsolutePositionTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testVisitor", testVisitor),
+    ("testClosure", testClosure),
+    ("testRename", testRename),
+    ("testCurrentFile", testCurrentFile),
+    ("testRecursion", testRecursion),
+    ("testTrivias", testTrivias),
+    ("testImplicit", testImplicit),
+    ("testWithoutSourceFileRoot", testWithoutSourceFileRoot),
+  ]
+
   public func testVisitor() {
     XCTAssertNoThrow(try {
       let source = try String(contentsOf: getInput("visitor.swift"))

Tests/SwiftSyntaxTest/DeserializeFile.swift

@@ -1,7 +1,12 @@
 import XCTest
 import SwiftSyntax
 
-public class DecodeSytnaxTestCase: XCTestCase {
+public class DecodeSyntaxTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testBasic", testBasic),
+  ]
+
   public func testBasic() {
     XCTAssertNoThrow(try {
       let inputFile = getInput("visitor.swift")

Tests/SwiftSyntaxTest/DiagnosticTest.swift

@@ -28,6 +28,12 @@ fileprivate extension Diagnostic.Message {
 }
 
 public class DiagnosticTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testDiagnosticEmission", testDiagnosticEmission),
+    ("testSourceLocations", testSourceLocations),
+  ]
+
   public func testDiagnosticEmission() {
     let startLoc = loc()
     let fixLoc = loc()

Tests/SwiftSyntaxTest/LazyCaching.swift

@@ -2,6 +2,12 @@ import XCTest
 import SwiftSyntax
 
 public class LazyCachingTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testPathological", testPathological),
+    ("testTwoAccesses", testTwoAccesses),
+  ]
+
   public func testPathological() {
     let tuple = SyntaxFactory.makeVoidTupleType()
 

Tests/SwiftSyntaxTest/ParseFile.swift

@@ -19,6 +19,11 @@ fileprivate class Test: NSObject {
 #endif
 
 public class ParseFileTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testParseSingleFile", testParseSingleFile)
+  ]
+
   public func testParseSingleFile() {
     let currentFile = URL(fileURLWithPath: #file)
     XCTAssertNoThrow(try {

Tests/SwiftSyntaxTest/SyntaxChildren.swift

@@ -1,7 +1,13 @@
 import XCTest
 import SwiftSyntax
 
-public class SyntaxChilderenTestCase: XCTestCase {
+public class SyntaxChildrenAPITestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testIterateWithAllPresent", testIterateWithAllPresent),
+    ("testIterateWithSomeMissing", testIterateWithSomeMissing),
+    ("testIterateWithAllMissing", testIterateWithAllMissing),
+  ]
 
   public func testIterateWithAllPresent() {
     let returnStmt = SyntaxFactory.makeReturnStmt(

Tests/SwiftSyntaxTest/SyntaxCollections.swift

@@ -8,7 +8,18 @@ func integerLiteralElement(_ int: Int) -> ArrayElementSyntax {
         trailingComma: nil)
 }
 
-public class SyntaxCollectionsTestCase: XCTestCase {
+public class SyntaxCollectionsAPITestCase: XCTestCase {
+
+    public static let allTests = [
+        ("testAppendingElement", testAppendingElement),
+        ("testInsertingElement", testInsertingElement),
+        ("testPrependingElement", testPrependingElement),
+        ("testRemovingFirstElement", testRemovingFirstElement),
+        ("testRemovingLastElement", testRemovingLastElement),
+        ("testRemovingElement", testRemovingElement),
+        ("testReplacingElement", testReplacingElement),
+    ]
+
     public func testAppendingElement() {
         let arrayElementList = SyntaxFactory.makeArrayElementList([
             integerLiteralElement(0)

Tests/SwiftSyntaxTest/SyntaxFactory.swift

@@ -16,7 +16,13 @@ func cannedStructDecl() -> StructDeclSyntax {
   }
 }
 
-public class SyntaxFactoryTestCase: XCTestCase {
+public class SyntaxFactoryAPITestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testGenerated", testGenerated),
+    ("testTokenSyntax", testTokenSyntax),
+    ("testFunctionCallSyntaxBuilder", testFunctionCallSyntaxBuilder),
+  ]
 
   public func testGenerated() {
 

Tests/SwiftSyntaxTest/VisitorTest.swift

@@ -2,6 +2,14 @@ import XCTest
 import SwiftSyntax
 
 public class SyntaxVisitorTestCase: XCTestCase {
+
+  public static let allTests = [
+    ("testBasic", testBasic),
+    ("testRewritingNodeWithEmptyChild", testRewritingNodeWithEmptyChild),
+    ("testSyntaxRewriterVisitAny", testSyntaxRewriterVisitAny),
+    ("testSyntaxRewriterVisitCollection", testSyntaxRewriterVisitCollection),
+  ]
+
   public func testBasic() {
     class FuncCounter: SyntaxVisitor {
       var funcCount = 0