From ff2e043a1e0532a21584d27d4c8e1a447618c14e Mon Sep 17 00:00:00 2001 From: Jonathan Grynspan Date: Mon, 27 Nov 2023 12:59:42 -0500 Subject: [PATCH] Don't use Core Foundation in tests. This PR removes a dependency on Core Foundation in a couple of our tests. The dependency is unnecessary and causes linkage issues on Windows per @etcwilde. Resolves rdar://116586683. --- Tests/Functional/Asynchronous/Expectations/main.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Tests/Functional/Asynchronous/Expectations/main.swift b/Tests/Functional/Asynchronous/Expectations/main.swift index da8e307b..4772c382 100644 --- a/Tests/Functional/Asynchronous/Expectations/main.swift +++ b/Tests/Functional/Asynchronous/Expectations/main.swift @@ -1,4 +1,4 @@ -// RUN: %{swiftc} -Xfrontend -disable-autolink-framework -Xfrontend CoreFoundation %s -o %T/Asynchronous +// RUN: %{swiftc} %s -o %T/Asynchronous // RUN: %T/Asynchronous > %t || true // RUN: %{xctest_checker} %t %s @@ -8,8 +8,6 @@ import XCTest #endif -import CoreFoundation - // CHECK: Test Suite 'All tests' started at \d+-\d+-\d+ \d+:\d+:\d+\.\d+ // CHECK: Test Suite '.*\.xctest' started at \d+-\d+-\d+ \d+:\d+:\d+\.\d+ @@ -273,7 +271,7 @@ class ExpectationsTestCase: XCTestCase { // CHECK: Test Case 'ExpectationsTestCase.test_combiningInverseAndStandardExpectationsWithOrderingEnforcement' passed \(\d+\.\d+ seconds\) func test_combiningInverseAndStandardExpectationsWithOrderingEnforcement() { var a, b, c: XCTestExpectation - var start: CFAbsoluteTime + var start: TimeInterval a = XCTestExpectation(description: "a") a.isInverted = true @@ -431,7 +429,7 @@ class ExpectationsTestCase: XCTestCase { let outerWaiter = XCTWaiter(delegate: self) let outerExpectation = XCTestExpectation(description: "outer") - var outerExpectationFulfillTime = CFAbsoluteTime(0) + var outerExpectationFulfillTime = TimeInterval(0) RunLoop.main.perform { RunLoop.main.perform { outerExpectationFulfillTime = Date.timeIntervalSinceReferenceDate