update conditional compilation flags
diff --git a/Sources/XCTest/Private/PerformanceMeter.swift b/Sources/XCTest/Private/PerformanceMeter.swift
index 5730a0b..aa6623d 100644
--- a/Sources/XCTest/Private/PerformanceMeter.swift
+++ b/Sources/XCTest/Private/PerformanceMeter.swift
@@ -11,10 +11,10 @@
// Measures the performance of a block of code and reports the results.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// Describes a type that is capable of measuring some aspect of code performance
diff --git a/Sources/XCTest/Private/PrintObserver.swift b/Sources/XCTest/Private/PrintObserver.swift
index da84b84..fe2ca7d 100644
--- a/Sources/XCTest/Private/PrintObserver.swift
+++ b/Sources/XCTest/Private/PrintObserver.swift
@@ -11,10 +11,10 @@
// Prints test progress to stdout.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// Prints textual representations of each XCTestObservation event to stdout.
diff --git a/Sources/XCTest/Private/TestListing.swift b/Sources/XCTest/Private/TestListing.swift
index 74035f6..a840ab3 100644
--- a/Sources/XCTest/Private/TestListing.swift
+++ b/Sources/XCTest/Private/TestListing.swift
@@ -11,10 +11,10 @@
// Implementation of the mode for printing the list of tests.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
internal struct TestListing {
diff --git a/Sources/XCTest/Private/WallClockTimeMetric.swift b/Sources/XCTest/Private/WallClockTimeMetric.swift
index dbbc45a..ed614b6 100644
--- a/Sources/XCTest/Private/WallClockTimeMetric.swift
+++ b/Sources/XCTest/Private/WallClockTimeMetric.swift
@@ -11,10 +11,10 @@
// Performance metric measuring how long it takes code to execute
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// This metric uses the system uptime to keep track of how much time passes
diff --git a/Sources/XCTest/Private/XCPredicateExpectation.swift b/Sources/XCTest/Private/XCPredicateExpectation.swift
index efd73c0..06cac80 100644
--- a/Sources/XCTest/Private/XCPredicateExpectation.swift
+++ b/Sources/XCTest/Private/XCPredicateExpectation.swift
@@ -11,10 +11,10 @@
// Expectations with a specified predicate and object to evaluate.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
internal class XCPredicateExpectation: XCTestExpectation {
diff --git a/Sources/XCTest/Private/XCTestCaseSuite.swift b/Sources/XCTest/Private/XCTestCaseSuite.swift
index aee2c21..581efc8 100644
--- a/Sources/XCTest/Private/XCTestCaseSuite.swift
+++ b/Sources/XCTest/Private/XCTestCaseSuite.swift
@@ -11,10 +11,10 @@
// A test suite associated with a particular test case class.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A test suite which is associated with a particular test case class. It will
diff --git a/Sources/XCTest/Public/Asynchronous/XCNotificationExpectationHandler.swift b/Sources/XCTest/Public/Asynchronous/XCNotificationExpectationHandler.swift
index 7631ec5..4aa774f 100644
--- a/Sources/XCTest/Public/Asynchronous/XCNotificationExpectationHandler.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCNotificationExpectationHandler.swift
@@ -12,10 +12,10 @@
// observed.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A block to be invoked when a notification specified by the expectation is
diff --git a/Sources/XCTest/Public/Asynchronous/XCPredicateExpectationHandler.swift b/Sources/XCTest/Public/Asynchronous/XCPredicateExpectationHandler.swift
index 6a0a37b..d771f70 100644
--- a/Sources/XCTest/Public/Asynchronous/XCPredicateExpectationHandler.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCPredicateExpectationHandler.swift
@@ -12,10 +12,10 @@
// evaluated with a given object.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A block to be invoked when evaluating the predicate against the object
diff --git a/Sources/XCTest/Public/Asynchronous/XCTestCase+Asynchronous.swift b/Sources/XCTest/Public/Asynchronous/XCTestCase+Asynchronous.swift
index b218614..902cfab 100644
--- a/Sources/XCTest/Public/Asynchronous/XCTestCase+Asynchronous.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCTestCase+Asynchronous.swift
@@ -11,10 +11,10 @@
// Methods on XCTestCase for testing asynchronous operations
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
public extension XCTestCase {
diff --git a/Sources/XCTest/Public/Asynchronous/XCTestCase+NotificationExpectation.swift b/Sources/XCTest/Public/Asynchronous/XCTestCase+NotificationExpectation.swift
index 109927f..4a5e093 100644
--- a/Sources/XCTest/Public/Asynchronous/XCTestCase+NotificationExpectation.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCTestCase+NotificationExpectation.swift
@@ -10,10 +10,10 @@
// XCTestCase+NotificationExpectation.swift
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
public extension XCTestCase {
diff --git a/Sources/XCTest/Public/Asynchronous/XCTestCase+PredicateExpectation.swift b/Sources/XCTest/Public/Asynchronous/XCTestCase+PredicateExpectation.swift
index e282c78..3f1167b 100644
--- a/Sources/XCTest/Public/Asynchronous/XCTestCase+PredicateExpectation.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCTestCase+PredicateExpectation.swift
@@ -10,10 +10,10 @@
// XCTestCase+PredicateExpectation.swift
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
public extension XCTestCase {
diff --git a/Sources/XCTest/Public/Asynchronous/XCWaitCompletionHandler.swift b/Sources/XCTest/Public/Asynchronous/XCWaitCompletionHandler.swift
index e65ec23..a9bd895 100644
--- a/Sources/XCTest/Public/Asynchronous/XCWaitCompletionHandler.swift
+++ b/Sources/XCTest/Public/Asynchronous/XCWaitCompletionHandler.swift
@@ -12,10 +12,10 @@
// fulfilled times out.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A block to be invoked when a call to wait times out or has had all
diff --git a/Sources/XCTest/Public/XCTestCase.swift b/Sources/XCTest/Public/XCTestCase.swift
index 2dcddcb..ea93d8d 100644
--- a/Sources/XCTest/Public/XCTestCase.swift
+++ b/Sources/XCTest/Public/XCTestCase.swift
@@ -11,10 +11,10 @@
// Base class for test cases
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// This is a compound type used by `XCTMain` to represent tests to run. It combines an
diff --git a/Sources/XCTest/Public/XCTestMain.swift b/Sources/XCTest/Public/XCTestMain.swift
index 97a248c..9616aea 100644
--- a/Sources/XCTest/Public/XCTestMain.swift
+++ b/Sources/XCTest/Public/XCTestMain.swift
@@ -12,12 +12,16 @@
// for running tests and some infrastructure for running them.
//
-#if os(Linux) || os(FreeBSD)
- import Glibc
- import Foundation
-#else
- import Darwin
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
+#endif
+
+#if os(macOS)
+ import Darwin
+#elseif os(Linux) || os(FreeBSD)
+ import Glibc
#endif
/// Starts a test run for the specified test cases.
@@ -93,4 +97,3 @@
exit(rootTestSuite.testRun!.totalFailureCount == 0 ? 0 : 1)
}
}
-
diff --git a/Sources/XCTest/Public/XCTestObservation.swift b/Sources/XCTest/Public/XCTestObservation.swift
index 4e58b92..a25858b 100644
--- a/Sources/XCTest/Public/XCTestObservation.swift
+++ b/Sources/XCTest/Public/XCTestObservation.swift
@@ -11,10 +11,10 @@
// Hooks for being notified about progress during a test run.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// `XCTestObservation` provides hooks for being notified about progress during a
diff --git a/Sources/XCTest/Public/XCTestObservationCenter.swift b/Sources/XCTest/Public/XCTestObservationCenter.swift
index 77681c8..b6e115e 100644
--- a/Sources/XCTest/Public/XCTestObservationCenter.swift
+++ b/Sources/XCTest/Public/XCTestObservationCenter.swift
@@ -11,10 +11,10 @@
// Notification center for test run progress events.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// Provides a registry for objects wishing to be informed about progress
diff --git a/Sources/XCTest/Public/XCTestRun.swift b/Sources/XCTest/Public/XCTestRun.swift
index 073fe95..fcf612d 100644
--- a/Sources/XCTest/Public/XCTestRun.swift
+++ b/Sources/XCTest/Public/XCTestRun.swift
@@ -11,10 +11,10 @@
// A test run collects information about the execution of a test.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A test run collects information about the execution of a test. Failures in
diff --git a/Sources/XCTest/Public/XCTestSuiteRun.swift b/Sources/XCTest/Public/XCTestSuiteRun.swift
index 63d4368..5effbd7 100644
--- a/Sources/XCTest/Public/XCTestSuiteRun.swift
+++ b/Sources/XCTest/Public/XCTestSuiteRun.swift
@@ -11,10 +11,10 @@
// A test run for an `XCTestSuite`.
//
-#if os(Linux) || os(FreeBSD)
- import Foundation
-#else
+#if os(macOS)
import SwiftFoundation
+#else
+ import Foundation
#endif
/// A test run for an `XCTestSuite`.
diff --git a/Tests/Functional/Asynchronous/Expectations/main.swift b/Tests/Functional/Asynchronous/Expectations/main.swift
index 2c0d97b..651bf54 100644
--- a/Tests/Functional/Asynchronous/Expectations/main.swift
+++ b/Tests/Functional/Asynchronous/Expectations/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Asynchronous > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Handler/main.swift b/Tests/Functional/Asynchronous/Handler/main.swift
index 9aa4758..05a54ec 100644
--- a/Tests/Functional/Asynchronous/Handler/main.swift
+++ b/Tests/Functional/Asynchronous/Handler/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Handler > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Misuse/main.swift b/Tests/Functional/Asynchronous/Misuse/main.swift
index c0b585a..39155d2 100644
--- a/Tests/Functional/Asynchronous/Misuse/main.swift
+++ b/Tests/Functional/Asynchronous/Misuse/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/Misuse > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Notifications/Expectations/main.swift b/Tests/Functional/Asynchronous/Notifications/Expectations/main.swift
index 6d24a29..cd91a7a 100644
--- a/Tests/Functional/Asynchronous/Notifications/Expectations/main.swift
+++ b/Tests/Functional/Asynchronous/Notifications/Expectations/main.swift
@@ -2,15 +2,14 @@
// RUN: %T/Asynchronous-Notifications > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
-
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
// CHECK: Test Suite '.*\.xctest' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Notifications/Handler/main.swift b/Tests/Functional/Asynchronous/Notifications/Handler/main.swift
index c0b99c9..7c5b907 100644
--- a/Tests/Functional/Asynchronous/Notifications/Handler/main.swift
+++ b/Tests/Functional/Asynchronous/Notifications/Handler/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Asynchronous-Notifications-Handler > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Predicates/Expectations/main.swift b/Tests/Functional/Asynchronous/Predicates/Expectations/main.swift
index c4ca5e1..faaa6d4 100644
--- a/Tests/Functional/Asynchronous/Predicates/Expectations/main.swift
+++ b/Tests/Functional/Asynchronous/Predicates/Expectations/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Asynchronous-Predicates > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Asynchronous/Predicates/Handler/main.swift b/Tests/Functional/Asynchronous/Predicates/Handler/main.swift
index 0920bee..01cc869 100644
--- a/Tests/Functional/Asynchronous/Predicates/Handler/main.swift
+++ b/Tests/Functional/Asynchronous/Predicates/Handler/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Asynchronous-Predicates-Handler > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/ErrorHandling/main.swift b/Tests/Functional/ErrorHandling/main.swift
index 8c08e94..152d225 100644
--- a/Tests/Functional/ErrorHandling/main.swift
+++ b/Tests/Functional/ErrorHandling/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/ErrorHandling > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/FailingTestSuite/main.swift b/Tests/Functional/FailingTestSuite/main.swift
index 2b0799a..eec8b90 100644
--- a/Tests/Functional/FailingTestSuite/main.swift
+++ b/Tests/Functional/FailingTestSuite/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/FailingTestSuite > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/FailureMessagesTestCase/main.swift b/Tests/Functional/FailureMessagesTestCase/main.swift
index 02667ce..92a7336 100644
--- a/Tests/Functional/FailureMessagesTestCase/main.swift
+++ b/Tests/Functional/FailureMessagesTestCase/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/FailureMessagesTestCase > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// Regression test for https://github.com/apple/swift-corelibs-xctest/pull/22
diff --git a/Tests/Functional/ListTests/main.swift b/Tests/Functional/ListTests/main.swift
index 8db4922..97c0580 100644
--- a/Tests/Functional/ListTests/main.swift
+++ b/Tests/Functional/ListTests/main.swift
@@ -5,12 +5,12 @@
// RUN: %T/ListTests --verify %t_json > %t_verify
// RUN: %{xctest_checker} %t_verify verify_json.expected
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// The JSON output isn't a stable enough format to use FileCheck-style line
diff --git a/Tests/Functional/NegativeAccuracyTestCase/main.swift b/Tests/Functional/NegativeAccuracyTestCase/main.swift
index 4634d11..370f285 100644
--- a/Tests/Functional/NegativeAccuracyTestCase/main.swift
+++ b/Tests/Functional/NegativeAccuracyTestCase/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/NegativeAccuracyTestCase > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// Regression test for https://github.com/apple/swift-corelibs-xctest/pull/7
diff --git a/Tests/Functional/Observation/All/main.swift b/Tests/Functional/Observation/All/main.swift
index 564af6c..7e1d07f 100644
--- a/Tests/Functional/Observation/All/main.swift
+++ b/Tests/Functional/Observation/All/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/All > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Observation/Selected/main.swift b/Tests/Functional/Observation/Selected/main.swift
index dc70ddb..c547a71 100644
--- a/Tests/Functional/Observation/Selected/main.swift
+++ b/Tests/Functional/Observation/Selected/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Selected Selected.ExecutedTestCase/test_executed > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'Selected tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Performance/Misuse/main.swift b/Tests/Functional/Performance/Misuse/main.swift
index 4219068..5bca218 100644
--- a/Tests/Functional/Performance/Misuse/main.swift
+++ b/Tests/Functional/Performance/Misuse/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/PerformanceMisuse > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/Performance/main.swift b/Tests/Functional/Performance/main.swift
index 950db88..6c69aac 100644
--- a/Tests/Functional/Performance/main.swift
+++ b/Tests/Functional/Performance/main.swift
@@ -2,12 +2,12 @@
// RUN: %T/Performance > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
- import Foundation
-#else
- import SwiftXCTest
+#if os(macOS)
import SwiftFoundation
+ import SwiftXCTest
+#else
+ import Foundation
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/SelectedTest/main.swift b/Tests/Functional/SelectedTest/main.swift
index fb4db0f..73608c8 100644
--- a/Tests/Functional/SelectedTest/main.swift
+++ b/Tests/Functional/SelectedTest/main.swift
@@ -6,10 +6,10 @@
// RUN: %{xctest_checker} -p "// CHECK-CLASS:" %T/one_test_case_class %s
// RUN: %{xctest_checker} -p "// CHECK-ALL:" %T/all %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK-METHOD: Test Suite 'Selected tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/SingleFailingTestCase/main.swift b/Tests/Functional/SingleFailingTestCase/main.swift
index 40aad4e..3482915 100644
--- a/Tests/Functional/SingleFailingTestCase/main.swift
+++ b/Tests/Functional/SingleFailingTestCase/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/SingleFailingTestCase > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
diff --git a/Tests/Functional/TestCaseLifecycle/main.swift b/Tests/Functional/TestCaseLifecycle/main.swift
index f30aeae..e27a919 100644
--- a/Tests/Functional/TestCaseLifecycle/main.swift
+++ b/Tests/Functional/TestCaseLifecycle/main.swift
@@ -2,10 +2,10 @@
// RUN: %T/TestCaseLifecycle > %t || true
// RUN: %{xctest_checker} %t %s
-#if os(Linux) || os(FreeBSD)
- import XCTest
-#else
+#if os(macOS)
import SwiftXCTest
+#else
+ import XCTest
#endif
// CHECK: Test Suite 'All tests' started at \d+:\d+:\d+\.\d+
