Leave imports in xdgTestHelper.swift

Author: johnno1962

TestFoundation/HTTPServer.swift

@@ -14,9 +14,9 @@
 
 import Dispatch
 
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
     import Darwin
-#elseif os(Linux)
+#elseif canImport(Glibc)
     import Glibc
 #endif
 

TestFoundation/XDGTestHelper.swift

@@ -7,6 +7,12 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if os(Linux) || os(Android)
+    import Foundation
+#else
+    import SwiftFoundation
+#endif
+
 class XDGCheck {
 
     static func run() -> Never {

TestFoundation/main.swift

@@ -9,9 +9,9 @@
 
 // Most imports now centraized in TestImports.swift
 
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
     import Darwin
-#elseif os(Linux) || os(Android)
+#elseif canImport(Glibc)
     import Glibc
 #endif
 

TestFoundation/xdgTestHelper/main.swift

@@ -7,6 +7,12 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if os(Linux) || os(Android)
+    import Foundation
+#else
+    import SwiftFoundation
+#endif
+
 enum HelperCheckStatus : Int32 {
     case ok                 = 0
     case fail               = 1