From db287f06248ed1de56711cc69b1b467f84131938 Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Sun, 2 Apr 2017 16:06:45 +0300 Subject: [PATCH] Linux tests + Package.swift fixes --- Package.swift | 5 ----- Tests/LinuxMain.swift | 9 +++++++++ Tests/RDBCTests/PoolTests.swift | 10 ++++++++++ Tests/RDBCTests/XCTestManifests.swift | 9 +++++++++ 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 Tests/LinuxMain.swift create mode 100644 Tests/RDBCTests/XCTestManifests.swift diff --git a/Package.swift b/Package.swift index 00bd067..a55365e 100644 --- a/Package.swift +++ b/Package.swift @@ -2,11 +2,6 @@ import PackageDescription let package = Package( name: "RDBC", - targets: [ - Target( - name: "RDBC" - ), - ], dependencies: [ .Package(url: "https://github.com/reactive-swift/Future.git", majorVersion: 0, minor: 2), //.Package(url: "https://github.com/IBM-Swift/CLibpq.git", majorVersion: 0, minor: 1), diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift new file mode 100644 index 0000000..639a169 --- /dev/null +++ b/Tests/LinuxMain.swift @@ -0,0 +1,9 @@ +import XCTest + +import RDBCTests + +var tests = [XCTestCaseEntry]() + +tests += RDBCTests.allTests() + +XCTMain(tests) diff --git a/Tests/RDBCTests/PoolTests.swift b/Tests/RDBCTests/PoolTests.swift index 47db61a..5e42144 100644 --- a/Tests/RDBCTests/PoolTests.swift +++ b/Tests/RDBCTests/PoolTests.swift @@ -57,3 +57,13 @@ class PoolTests: XCTestCase { self.waitForExpectations(timeout: 1, handler: nil) } } + +#if os(Linux) +extension PoolTests { + static var allTests : [(String, (PoolTests) -> () throws -> Void)] { + return [ + ("testConcurrent", testConcurrent), + ] + } +} +#endif \ No newline at end of file diff --git a/Tests/RDBCTests/XCTestManifests.swift b/Tests/RDBCTests/XCTestManifests.swift new file mode 100644 index 0000000..ee25042 --- /dev/null +++ b/Tests/RDBCTests/XCTestManifests.swift @@ -0,0 +1,9 @@ +import XCTest + +#if os(Linux) +public func allTests() -> [XCTestCaseEntry] { + return [ + testCase(PoolTests.allTests) + ] +} +#endif \ No newline at end of file