Skip to content

Commit 86601e2

Browse files
[TEST-ONLY] Make caching tests to require Xcode26
Add compilation caching test requirement to be Xcode26 to workaround issues in older compiler versions.
1 parent 1cde173 commit 86601e2

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Sources/SWBTestSupport/SkippedTestSupport.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,10 @@ extension Trait where Self == Testing.ConditionTrait {
299299
/// Constructs a condition trait that causes a test to be disabled if not running against a version of Xcode within the given range.
300300
package static func requireXcodeBuildVersions<R: RangeExpression>(in range: @Sendable @autoclosure @escaping () throws -> R, sourceLocation: SourceLocation = #_sourceLocation) -> Self where R.Bound == ProductBuildVersion {
301301
enabled("Xcode version is not suitable", sourceLocation: sourceLocation, {
302-
return try await range().contains(InstalledXcode.currentlySelected().productBuildVersion())
302+
guard let installedVersion = try? await InstalledXcode.currentlySelected().productBuildVersion() else {
303+
return true
304+
}
305+
return try range().contains(installedVersion)
303306
})
304307
}
305308

Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import SWBTestSupport
1919
import SWBUtil
2020

2121
@Suite(.skipHostOS(.windows, "Windows platform has no CAS support yet"),
22-
.requireDependencyScannerPlusCaching, .skipInXcodeCloud("flaky tests"))
22+
.requireDependencyScannerPlusCaching, .skipInXcodeCloud("flaky tests"), .requireXcode26())
2323
fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
2424
let canUseCASPlugin: Bool
2525
let canUseCASPruning: Bool

Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
192192
}
193193

194194
@Test(.requireSDKs(.macOS), .requireClangFeatures(.wSystemHeadersInModule), .requireDependencyScannerPlusCaching,
195-
.skipInXcodeCloud("flaky tests"))
195+
.skipInXcodeCloud("flaky tests"), .requireXcode26())
196196
func cachedBuild() async throws {
197197
try await withTemporaryDirectory { (tmpDirPath: Path) in
198198
let archs = ["arm64", "x86_64"]

Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import SWBTaskExecution
2020
import SWBProtocol
2121

2222
@Suite(.requireSwiftFeatures(.compilationCaching),
23-
.skipInXcodeCloud("flaky tests"))
23+
.skipInXcodeCloud("flaky tests"), .requireXcode26())
2424
fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
2525
@Test(.requireSDKs(.iOS))
2626
func swiftCachingSimple() async throws {

0 commit comments

Comments
 (0)