Skip more tests

yonaskolb · Oct 24, 2024 · 66d83a4 · 66d83a4
1 parent 6df7ab6
commit 66d83a4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/Sources/TestSupport/TestHelpers.swift b/Sources/TestSupport/TestHelpers.swift
@@ -124,3 +124,11 @@ extension XCTestCase {
         describe(name, test)
     }
 }
+
+
+public func skipIfNecessary() throws {
+    #if os(Linux) && swift(<6.0.2)
+        // https://github.com/swiftlang/swift-foundation/pull/1002
+        throw XCTSkip("Skipping test on Linux until PropertyListDecoder issues are fixed.")
+    #endif
+}
diff --git a/Tests/PerformanceTests/PerformanceTests.swift b/Tests/PerformanceTests/PerformanceTests.swift
@@ -1,6 +1,7 @@
 import Foundation
 import PathKit
 import ProjectSpec
+import TestSupport
 import XcodeGenKit
 import XcodeProj
 import XCTest
@@ -62,11 +63,7 @@ class FixturePerformanceTests: XCTestCase {
     }
 
     func testFixtureGeneration() throws {
-        #if os(Linux) && swift(<6.0.2)
-            // https://github.com/swiftlang/swift-foundation/pull/1002
-            throw XCTSkip("Skipping test on Linux until PropertyListDecoder issues are fixed.")
-        #endif
-
+        try skipIfNecessary()
         let project = try Project(path: specPath)
         measure {
             let generator = ProjectGenerator(project: project)
@@ -75,11 +72,7 @@ class FixturePerformanceTests: XCTestCase {
     }
 
     func testFixtureWriting() throws {
-        #if os(Linux) && swift(<6.0.2)
-            // https://github.com/swiftlang/swift-foundation/pull/1002
-            throw XCTSkip("Skipping test on Linux until PropertyListDecoder issues are fixed.")
-        #endif
-
+        try skipIfNecessary()
         let project = try Project(path: specPath)
         let generator = ProjectGenerator(project: project)
         let xcodeProject = try generator.generateXcodeProject(userName: "someUser")

diff --git a/Tests/XcodeGenKitTests/ProjectGeneratorTests.swift b/Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
@@ -275,7 +275,8 @@ class ProjectGeneratorTests: XCTestCase {
         }
     }
 
-    func testTargets() {
+    func testTargets() throws {
+        try skipIfNecessary()
         describe {
 
             let project = Project(name: "test", targets: targets)

diff --git a/Tests/XcodeGenKitTests/SchemeGeneratorTests.swift b/Tests/XcodeGenKitTests/SchemeGeneratorTests.swift
@@ -41,7 +41,8 @@ private let uiTest = Target(
 
 class SchemeGeneratorTests: XCTestCase {
 
-    func testSchemes() {
+    func testSchemes() throws {
+        try skipIfNecessary()
         describe {
 
             let buildTarget = Scheme.BuildTarget(target: .local(app.name))

diff --git a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift
@@ -10,10 +10,7 @@ import TestSupport
 class SourceGeneratorTests: XCTestCase {
 
     func testSourceGenerator() throws {
-        #if os(Linux) && swift(<6.0.2)
-            // https://github.com/swiftlang/swift-foundation/pull/1002
-            throw XCTSkip("Skipping test on Linux until PropertyListDecoder issues are fixed.")
-        #endif
+        try skipIfNecessary()
         describe {
 
             let directoryPath = Path("TestDirectory")