Merge pull request swiftlang#1845 from ikesyo/testurl-fix-xcode-build

swift-ci · web-flow · commit d46e20dffcc6 · 2019-01-24T09:58:18.000-08:00
diff --git a/TestFoundation/TestURL.swift b/TestFoundation/TestURL.swift
@@ -39,17 +39,10 @@ private func getTestData() -> [Any]? {
         XCTFail("Unable to deserialize property list data")
         return nil
     }
-    #if swift(>=5.0)
     guard let parsingTests = testRoot[kURLTestParsingTestsKey] as? [Any] else {
         XCTFail("Unable to create the parsingTests dictionary")
         return nil
     }
-    #else
-    guard let parsingTests = testRoot?[kURLTestParsingTestsKey] as? [Any] else {
-        XCTFail("Unable to create the parsingTests dictionary")
-        return nil
-    }
-    #endif
     return parsingTests
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,10 @@ private func getTestData() -> [Any]? {`
`39`	`39`	`XCTFail("Unable to deserialize property list data")`
`40`	`40`	`return nil`
`41`	`41`	`}`
`42`		`- #if swift(>=5.0)`
`43`	`42`	`guard let parsingTests = testRoot[kURLTestParsingTestsKey] as? [Any] else {`
`44`	`43`	`XCTFail("Unable to create the parsingTests dictionary")`
`45`	`44`	`return nil`
`46`	`45`	`}`
`47`		`- #else`
`48`		`- guard let parsingTests = testRoot?[kURLTestParsingTestsKey] as? [Any] else {`
`49`		`- XCTFail("Unable to create the parsingTests dictionary")`
`50`		`- return nil`
`51`		`- }`
`52`		`- #endif`
`53`	`46`	`return parsingTests`
`54`	`47`	`}`
`55`	`48`