From 418b6787fa6b495f6882d079a706ae4aff2cb328 Mon Sep 17 00:00:00 2001 From: Norio Nomura Date: Fri, 12 May 2017 15:17:00 +0900 Subject: [PATCH 1/3] Revert "Skip tests failing on Linux" This reverts commit 6ab79e707bedbe3d457b9470f5d8847153702832. --- Tests/SourceKittenFrameworkTests/ModuleTests.swift | 5 ----- Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/Tests/SourceKittenFrameworkTests/ModuleTests.swift b/Tests/SourceKittenFrameworkTests/ModuleTests.swift index 2f3789d7d..01fc609e0 100644 --- a/Tests/SourceKittenFrameworkTests/ModuleTests.swift +++ b/Tests/SourceKittenFrameworkTests/ModuleTests.swift @@ -48,10 +48,6 @@ class ModuleTests: XCTestCase { #if SWIFT_PACKAGE extension ModuleTests { func testCommandantDocsSPM() { - #if swift(>=3.1) && os(Linux) - // FIXME - print("FIXME: Skip \(#function), because our sourcekitInProc on Swift 3.1 for Linux seems to be broken") - #else func findCommandant(in directory: String) -> String? { guard let contents = try? FileManager.default.contentsOfDirectory(atPath: directory), let subDirectory = contents.first(where: { $0.hasPrefix("Commandant") }) else { @@ -72,7 +68,6 @@ extension ModuleTests { } let commandantModule = Module(spmName: "Commandant")! compareJSONString(withFixtureNamed: "CommandantSPM", jsonString: commandantModule.docs, rootDirectory: commandantPath) - #endif } static var allTests: [(String, (ModuleTests) -> () throws -> Void)] { diff --git a/Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift b/Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift index a83371494..74efa3d0c 100644 --- a/Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift +++ b/Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift @@ -67,21 +67,11 @@ private func compareDocs(withFixtureNamed name: String, file: StaticString = #fi class SwiftDocsTests: XCTestCase { func testSubscript() { - #if swift(>=3.1) && os(Linux) - // FIXME - print("FIXME: Skip \(#function), because our sourcekitInProc on Swift 3.1 for Linux seems to be broken") - #else compareDocs(withFixtureNamed: "Subscript") - #endif } func testBicycle() { - #if swift(>=3.1) && os(Linux) - // FIXME - print("FIXME: Skip \(#function), because our sourcekitInProc on Swift 3.1 for Linux seems to be broken") - #else compareDocs(withFixtureNamed: "Bicycle") - #endif } func testParseFullXMLDocs() { From 8d1e1c457b55864fb462a924e2fbeef52f582a4b Mon Sep 17 00:00:00 2001 From: Norio Nomura Date: Fri, 12 May 2017 15:52:05 +0900 Subject: [PATCH 2/3] Change `docker_test` to use my fixing branch of `SWXMLHash` --- Makefile | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d92c55291..583c12581 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ archive: release: package archive docker_test: - docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:311 swift test + docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:311 bash -c "swift package fetch; swift package edit SWXMLHash --revision nn-fix-crash-with-swift-3.1-on-linux; swift test" docker_test_302: docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:302 swift test diff --git a/Package.swift b/Package.swift index 8a02e932b..202dcca95 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( ], dependencies: [ .Package(url: "https://github.com/Carthage/Commandant.git", versions: Version(0, 12, 0).. Date: Fri, 12 May 2017 11:34:03 -0700 Subject: [PATCH 3/3] update SWXMLHash to 3.0.5 --- Cartfile.resolved | 2 +- Carthage/Checkouts/SWXMLHash | 2 +- Makefile | 2 +- Package.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 2f9a8162a..4bb57525d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "Carthage/Commandant" "0.12.0" github "antitypical/Result" "3.2.1" -github "drmohundro/SWXMLHash" "3.0.4" +github "drmohundro/SWXMLHash" "3.0.5" github "jpsim/Yams" "0.3.2" github "jspahrsummers/xcconfigs" "2055f18efbe18e77408f7f43947f7ad92b2d4ff0" diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash index f0dda12c0..b95e954c4 160000 --- a/Carthage/Checkouts/SWXMLHash +++ b/Carthage/Checkouts/SWXMLHash @@ -1 +1 @@ -Subproject commit f0dda12c05a9975ff1385647a75ceaa18330d3a8 +Subproject commit b95e954c42b07a639edf153460b18d6a73f8741e diff --git a/Makefile b/Makefile index 583c12581..d92c55291 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ archive: release: package archive docker_test: - docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:311 bash -c "swift package fetch; swift package edit SWXMLHash --revision nn-fix-crash-with-swift-3.1-on-linux; swift test" + docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:311 swift test docker_test_302: docker run -v `pwd`:`pwd` -w `pwd` norionomura/sourcekit:302 swift test diff --git a/Package.swift b/Package.swift index 202dcca95..d11d6ab90 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( ], dependencies: [ .Package(url: "https://github.com/Carthage/Commandant.git", versions: Version(0, 12, 0)..