Removes tests that are crashing compiler on Linux.

tottakai · Dec 28, 2015 · 9a73208 · 9a73208
1 parent 95dea91
commit 9a73208
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 33 deletions.
diff --git a/Sources/AllTests/HistoricalSchedulerTest.swift b/Sources/AllTests/HistoricalSchedulerTest.swift
diff --git a/Sources/AllTests/VirtualSchedulerTest.swift b/Sources/AllTests/VirtualSchedulerTest.swift
diff --git a/Sources/AllTests/main.swift b/Sources/AllTests/main.swift
@@ -79,20 +79,6 @@ _ObservableBlockingTest.allTests = [
 ]
 
 
-let _VirtualSchedulerTest = VirtualSchedulerTest()
-_VirtualSchedulerTest.allTests = [
- ("testVirtualScheduler_initialClock", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_initialClock(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_start", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_start(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_disposeStart", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_disposeStart(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_advanceToAfter", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_advanceToAfter(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_advanceToBefore", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_advanceToBefore(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_disposeAdvanceTo", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_disposeAdvanceTo(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_stop", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_stop(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_sleep", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_sleep(); _VirtualSchedulerTest.tearDown(); }),
- ("testVirtualScheduler_stress", { _VirtualSchedulerTest.setUp(); _VirtualSchedulerTest.testVirtualScheduler_stress(); _VirtualSchedulerTest.tearDown(); }),
-]
-
-
 let _ObserverTests = ObserverTests()
 _ObserverTests.allTests = [
  ("testConvenienceOn_Next", { _ObserverTests.setUp(); _ObserverTests.testConvenienceOn_Next(); _ObserverTests.tearDown(); }),
@@ -340,19 +326,6 @@ _ObservableMultipleTest.allTests = [
 ]
 
 
-let _HistoricalSchedulerTest = HistoricalSchedulerTest()
-_HistoricalSchedulerTest.allTests = [
- ("testHistoricalScheduler_initialClock", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_initialClock(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_start", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_start(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_disposeStart", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_disposeStart(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_advanceToAfter", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_advanceToAfter(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_advanceToBefore", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_advanceToBefore(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_disposeAdvanceTo", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_disposeAdvanceTo(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_stop", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_stop(); _HistoricalSchedulerTest.tearDown(); }),
- ("testHistoricalScheduler_sleep", { _HistoricalSchedulerTest.setUp(); _HistoricalSchedulerTest.testHistoricalScheduler_sleep(); _HistoricalSchedulerTest.tearDown(); }),
-]
-
-
 let _CurrentThreadSchedulerTest = CurrentThreadSchedulerTest()
 _CurrentThreadSchedulerTest.allTests = [
  ("testCurrentThreadScheduler_scheduleRequired", { _CurrentThreadSchedulerTest.setUp(); _CurrentThreadSchedulerTest.testCurrentThreadScheduler_scheduleRequired(); _CurrentThreadSchedulerTest.tearDown(); }),
@@ -750,10 +723,8 @@ CurrentThreadScheduler.instance.schedule(()) { _ in
  _QueueTest,
  _VariableTest,
  _ObservableBlockingTest,
- _VirtualSchedulerTest,
  _ObserverTests,
  _ObservableMultipleTest,
- _HistoricalSchedulerTest,
  _CurrentThreadSchedulerTest,
  _DisposableTest,
  _ObservableStandardSequenceOperatorsTest,

diff --git a/scripts/package-swift-manager.swift b/scripts/package-swift-manager.swift
@@ -34,7 +34,9 @@ let excludedTests = [
 
 let excludedTestClasses = [
  "ObservableConcurrentSchedulerConcurrencyTest",
- "SubjectConcurrencyTest"
+ "SubjectConcurrencyTest",
+ "VirtualSchedulerTest",
+ "HistoricalSchedulerTest"
 ]
 
 let throwingWordsInTests = [
@@ -190,6 +192,16 @@ try packageRelativePath(["RxCocoa/RxCocoa.h"], targetDirName: "RxCocoa")
 try packageRelativePath(["RxBlocking"], targetDirName: "RxBlocking")
 try packageRelativePath(["RxTests"], targetDirName: "RxTests")
 // It doesn't work under `Tests` subpath ¯\_(ツ)_/¯
-try packageRelativePath(["RxSwift/RxMutableBox.swift", "Tests/RxTest.swift", "Tests/Tests", "Tests/RxSwiftTests"], targetDirName: "AllTests")
+try packageRelativePath([
+ "RxSwift/RxMutableBox.swift",
+ "Tests/RxTest.swift",
+ "Tests/Tests",
+ "Tests/RxSwiftTests"
+ ],
+ targetDirName: "AllTests",
+ excluded: [
+ "Tests/VirtualSchedulerTest.swift",
+ "Tests/HistoricalSchedulerTest.swift"
+ ])
 
 try buildAllTestsTarget("Sources/AllTests")