Test SwiftSyntax using --enable-test-discovery

ahoppen · ahoppen · commit 3e09eea111ea · 2019-11-06T15:37:11.000-08:00
We can thus remove the allTests properties and LinuxMain.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
diff --git a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift
@@ -12,18 +12,6 @@ fileprivate class FuncRenamer: SyntaxRewriter {
 
 public class AbsolutePositionTests: XCTestCase {
 
-  public static let allTests = [
-    ("testVisitor", testVisitor),
-    ("testClosure", testClosure),
-    ("testRename", testRename),
-    ("testCurrentFile", testCurrentFile),
-    ("testRecursion", testRecursion),
-    ("testTrivias", testTrivias),
-    ("testImplicit", testImplicit),
-    ("testWithoutSourceFileRoot", testWithoutSourceFileRoot),
-    ("testSourceLocation", testSourceLocation),
-  ]
-
   public func testVisitor() {
     XCTAssertNoThrow(try {
       let source = try String(contentsOf: getInput("visitor.swift"))
diff --git a/Tests/SwiftSyntaxTest/ClassificationTests.swift b/Tests/SwiftSyntaxTest/ClassificationTests.swift
@@ -2,10 +2,6 @@ import XCTest
 import SwiftSyntax
 
 public class ClassificationTests: XCTestCase {
-  public static let allTests = [
-    ("testClassification", testClassification),
-    ("testTokenClassification", testTokenClassification),
-  ]
 
   public func testClassification() {
     let source = "// blah.\nlet x/*yo*/ = 0"
diff --git a/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift b/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift
@@ -3,10 +3,6 @@ import SwiftSyntax
 
 
 public class CustomReflectableTests: XCTestCase {
-  public static let allTests = [
-    ("testDump", testDump),
-  ]
-
 
   public func testDump() {
     struct TestCase {
diff --git a/Tests/SwiftSyntaxTest/DiagnosticTests.swift b/Tests/SwiftSyntaxTest/DiagnosticTests.swift
@@ -29,11 +29,6 @@ fileprivate extension Diagnostic.Message {
 
 public class DiagnosticTests: XCTestCase {
 
-  public static let allTests = [
-    ("testDiagnosticEmission", testDiagnosticEmission),
-    ("testSourceLocations", testSourceLocations),
-  ]
-
   public func testDiagnosticEmission() {
     let startLoc = loc()
     let fixLoc = loc()
diff --git a/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift b/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift
@@ -3,11 +3,6 @@ import SwiftSyntax
 
 public class IncrementalParsingTests: XCTestCase {
 
-  public static let allTests = [
-    ("testIncrementalInvalid", testIncrementalInvalid),
-    ("testReusedNode", testReusedNode),
-  ]
-
   public func testIncrementalInvalid() {
     let original = "struct A { func f() {"
     let step: (String, (Int, Int, String)) =
diff --git a/Tests/SwiftSyntaxTest/MultithreadingTests.swift b/Tests/SwiftSyntaxTest/MultithreadingTests.swift
@@ -3,11 +3,6 @@ import SwiftSyntax
 
 public class MultithreadingTests: XCTestCase {
 
-  public static let allTests = [
-    ("testPathological", testPathological),
-    ("testTwoAccesses", testTwoAccesses),
-  ]
-
   public func testPathological() {
     let tuple = SyntaxFactory.makeVoidTupleType()
 
diff --git a/Tests/SwiftSyntaxTest/ParseFileTests.swift b/Tests/SwiftSyntaxTest/ParseFileTests.swift
@@ -25,11 +25,6 @@ enum Animal {
 
 public class ParseFileTests: XCTestCase {
 
-  public static let allTests = [
-    ("testParseSingleFile", testParseSingleFile),
-    ("testEnumCaseStructure", testEnumCaseStructure)
-  ]
-
   public func testParseSingleFile() {
     let currentFile = URL(fileURLWithPath: #file)
     XCTAssertNoThrow(try {
diff --git a/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift
@@ -3,12 +3,6 @@ import SwiftSyntax
 
 public class SyntaxChildrenTests: XCTestCase {
 
-  public static let allTests = [
-    ("testIterateWithAllPresent", testIterateWithAllPresent),
-    ("testIterateWithSomeMissing", testIterateWithSomeMissing),
-    ("testIterateWithAllMissing", testIterateWithAllMissing),
-  ]
-
   public func testIterateWithAllPresent() {
     let returnStmt = SyntaxFactory.makeReturnStmt(
       returnKeyword: SyntaxFactory.makeReturnKeyword(),
diff --git a/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift
@@ -10,17 +10,6 @@ fileprivate func integerLiteralElement(_ int: Int) -> ArrayElementSyntax {
 
 public class SyntaxCollectionsTests: XCTestCase {
 
-  public static let allTests = [
-    ("testAppendingElement", testAppendingElement),
-    ("testInsertingElement", testInsertingElement),
-    ("testPrependingElement", testPrependingElement),
-    ("testRemovingFirstElement", testRemovingFirstElement),
-    ("testRemovingLastElement", testRemovingLastElement),
-    ("testRemovingElement", testRemovingElement),
-    ("testReplacingElement", testReplacingElement),
-    ("testIteration", testIteration),
-  ]
-
   public func testAppendingElement() {
       let arrayElementList = SyntaxFactory.makeArrayElementList([
           integerLiteralElement(0)
diff --git a/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift b/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift
@@ -18,16 +18,6 @@ fileprivate func cannedStructDecl() -> StructDeclSyntax {
 
 public class SyntaxFactoryTests: XCTestCase {
 
-  public static let allTests = [
-    ("testGenerated", testGenerated),
-    ("testTokenSyntax", testTokenSyntax),
-    ("testFunctionCallSyntaxBuilder", testFunctionCallSyntaxBuilder),
-    ("testWithOptionalChild", testWithOptionalChild),
-    ("testUnknownSyntax", testUnknownSyntax),
-    ("testMakeStringLiteralExpr", testMakeStringLiteralExpr),
-    ("testMakeBinaryOperator", testMakeBinaryOperator),
-  ]
-
   public func testGenerated() {
 
     let structDecl = cannedStructDecl()
diff --git a/Tests/SwiftSyntaxTest/SyntaxTests.swift b/Tests/SwiftSyntaxTest/SyntaxTests.swift
@@ -3,11 +3,6 @@ import SwiftSyntax
 
 public class SyntaxTests: XCTestCase {
 
-  public static let allTests = [
-    ("testSyntaxAPI", testSyntaxAPI),
-    ("testPositions", testPositions),
-  ]
-
   public func testSyntaxAPI() {
     let source = "struct A { func f() {} }"
     let tree = try! SyntaxParser.parse(source: source)
diff --git a/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift
@@ -20,10 +20,6 @@ fileprivate func cannedVarDecl() -> VariableDeclSyntax {
 
 public class SyntaxTreeModifierTests: XCTestCase {
 
-  public static let allTests = [
-    ("testAccessorAsModifier", testAccessorAsModifier)
-  ]
-
   public func testAccessorAsModifier() {
     var VD = cannedVarDecl()
     XCTAssertEqual("\(VD)", "let a: Int")
diff --git a/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift
@@ -3,14 +3,6 @@ import SwiftSyntax
 
 public class SyntaxVisitorTests: XCTestCase {
 
-  public static let allTests = [
-    ("testBasic", testBasic),
-    ("testRewritingNodeWithEmptyChild", testRewritingNodeWithEmptyChild),
-    ("testSyntaxRewriterVisitAny", testSyntaxRewriterVisitAny),
-    ("testSyntaxRewriterVisitCollection", testSyntaxRewriterVisitCollection),
-    ("testVisitorClass", testVisitorClass),
-  ]
-
   public func testBasic() {
     class FuncCounter: SyntaxVisitor {
       var funcCount = 0
diff --git a/Tests/SwiftSyntaxTest/TokenTest.swift b/Tests/SwiftSyntaxTest/TokenTest.swift
@@ -3,10 +3,6 @@ import SwiftSyntax
 
 public class TokenTests: XCTestCase {
 
-  public static let allTests = [
-    ("testKeywordKinds", testKeywordKinds),
-  ]
-
   public func testKeywordKinds() {
     XCTAssertTrue(TokenKind.operatorKeyword.isKeyword)
     XCTAssertTrue(TokenKind.funcKeyword.isKeyword)
diff --git a/Tests/SwiftSyntaxTest/TriviaTests.swift b/Tests/SwiftSyntaxTest/TriviaTests.swift
@@ -3,11 +3,6 @@ import SwiftSyntax
 
 public class TriviaTests: XCTestCase {
 
-  public static let allTests = [
-    ("testTriviaEquatable", testTriviaEquatable),
-    ("testTriviaPieceEquatable", testTriviaPieceEquatable)
-  ]
-
   func testTriviaEquatable() {
     XCTAssertEqual([.spaces(2), .tabs(1)] as Trivia, [.spaces(2), .tabs(1)])
     XCTAssertNotEqual([.spaces(2), .tabs(1)] as Trivia, [.spaces(2), .tabs(2)])
diff --git a/build-script.py b/build-script.py
@@ -165,6 +165,8 @@ def get_swiftpm_invocation(toolchain, action, build_dir, multiroot_data_file,
 
     swiftpm_call = [swift_exec, action]
     swiftpm_call.extend(['--package-path', PACKAGE_DIR])
+    if platform.system() != 'Darwin':
+      swiftpm_call.extend(['--enable-test-discovery'])
     if release:
         swiftpm_call.extend(['--configuration', 'release'])
     if build_dir:
