Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests crash with Swift 3.1.1 on Linux #378

Merged
merged 3 commits into from
May 12, 2017
Merged

Fix tests crash with Swift 3.1.1 on Linux #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
418b678
Revert "Skip tests failing on Linux"
norio-nomura May 12, 2017
8d1e1c4
Change `docker_test` to use my fixing branch of `SWXMLHash`
norio-nomura May 12, 2017
092b215
update SWXMLHash to 3.0.5
jpsim May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SWXMLHash
Open in desktop
Submodule SWXMLHash updated 5 files
+2 −0 .gitignore
+8 −0 CHANGELOG.md
+17 −3 README.md
+1 −1 SWXMLHash.podspec
+2 −2 Source/SWXMLHash.swift
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let package = Package(
],
dependencies: [
.Package(url: "https://github.com/Carthage/Commandant.git", versions: Version(0, 12, 0)..<Version(0, 12, .max)),
.Package(url: "https://github.com/drmohundro/SWXMLHash.git", Version(3, 0, 4)),
.Package(url: "https://github.com/drmohundro/SWXMLHash.git", Version(3, 0, 5)),
.Package(url: "https://github.com/jpsim/Yams.git", majorVersion: 0, minor: 3),
.Package(url: "https://github.com/norio-nomura/Clang_C.git", majorVersion: 1),
.Package(url: "https://github.com/norio-nomura/SourceKit.git", majorVersion: 1),
Expand Down
5 changes: 0 additions & 5 deletions Tests/SourceKittenFrameworkTests/ModuleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)] {
Expand Down
10 changes: 0 additions & 10 deletions Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down