swiftlang · briancroom · Dec 6, 2016 · Dec 2, 2016
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,12 +12,16 @@
 //  for running tests and some infrastructure for running them.
 //
 
-#if os(Linux) || os(FreeBSD)
-    import Glibc
-    import Foundation
+#if os(macOS)
+    import SwiftFoundation
 #else
+    import Foundation
+#endif
+
+#if os(macOS)
     import Darwin
-    import SwiftFoundation
+#elseif os(Linux) || os(FreeBSD)
+    import Glibc
 #endif
 
 /// Starts a test run for the specified test cases.
@@ -93,4 +97,3 @@ public func XCTMain(_ testCases: [XCTestCaseEntry]) -> Never {
         exit(rootTestSuite.testRun!.totalFailureCount == 0 ? 0 : 1)
     }
 }
-
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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+