Merge pull request #1220 from spevans/pr_fix_test_imports
diff --git a/TestFoundation/HTTPServer.swift b/TestFoundation/HTTPServer.swift
index f52b771..ec2055f 100644
--- a/TestFoundation/HTTPServer.swift
+++ b/TestFoundation/HTTPServer.swift
@@ -16,15 +16,19 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
- import Glibc
import XCTest
#else
- import CoreFoundation
import SwiftFoundation
- import Darwin
import SwiftXCTest
#endif
+#if os(OSX) || os(iOS)
+ import Darwin
+#elseif os(Linux)
+ import Glibc
+#endif
+
+
public let globalDispatchQueue = DispatchQueue.global()
public let dispatchQueueMake: (String) -> DispatchQueue = { DispatchQueue.init(label: $0) }
public let dispatchGroupMake: () -> DispatchGroup = DispatchGroup.init
@@ -97,10 +101,11 @@
// Listen on the loopback address so that OSX doesnt pop up a dialog
// asking to accept incoming connections if the firewall is enabled.
let addr = UInt32(INADDR_LOOPBACK).bigEndian
+ let netPort = UInt16(bigEndian: port ?? 0)
#if os(Linux)
- return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: htons(port ?? 0), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
+ return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
#else
- return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: CFSwapInt16HostToBig(port ?? 0), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
+ return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
#endif
}
diff --git a/TestFoundation/TestCalendar.swift b/TestFoundation/TestCalendar.swift
index 07198f2..0e90ace 100644
--- a/TestFoundation/TestCalendar.swift
+++ b/TestFoundation/TestCalendar.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestCalendar: XCTestCase {
diff --git a/TestFoundation/TestNSGeometry.swift b/TestFoundation/TestNSGeometry.swift
index 9367431..953bdd8 100644
--- a/TestFoundation/TestNSGeometry.swift
+++ b/TestFoundation/TestNSGeometry.swift
@@ -11,7 +11,6 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
import XCTest
- import CoreFoundation
#else
import SwiftFoundation
import SwiftXCTest
diff --git a/TestFoundation/TestNumberFormatter.swift b/TestFoundation/TestNumberFormatter.swift
index 6cf2be6..02914ad 100644
--- a/TestFoundation/TestNumberFormatter.swift
+++ b/TestFoundation/TestNumberFormatter.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestNumberFormatter: XCTestCase {
diff --git a/TestFoundation/TestProcess.swift b/TestFoundation/TestProcess.swift
index 922c607..54775b5 100644
--- a/TestFoundation/TestProcess.swift
+++ b/TestFoundation/TestProcess.swift
@@ -14,7 +14,6 @@
import SwiftFoundation
import SwiftXCTest
#endif
-import CoreFoundation
class TestProcess : XCTestCase {
static var allTests: [(String, (TestProcess) -> () throws -> Void)] {
diff --git a/TestFoundation/TestXMLDocument.swift b/TestFoundation/TestXMLDocument.swift
index d02ef9f..00bbbf4 100644
--- a/TestFoundation/TestXMLDocument.swift
+++ b/TestFoundation/TestXMLDocument.swift
@@ -17,7 +17,6 @@
import SwiftXCTest
#endif
-import CoreFoundation
class TestXMLDocument : XCTestCase {
diff --git a/TestFoundation/main.swift b/TestFoundation/main.swift
index cefca93..a1f6bf9 100644
--- a/TestFoundation/main.swift
+++ b/TestFoundation/main.swift
@@ -10,13 +10,18 @@
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
import Foundation
import XCTest
-import Glibc
#else
import SwiftFoundation
import SwiftXCTest
-import Darwin
#endif
+#if os(OSX) || os(iOS)
+ import Darwin
+#elseif os(Linux)
+ import Glibc
+#endif
+
+
internal func testBundle() -> Bundle {
return Bundle.main
}
