Refactor copy/pasta code

Author: aciidgh

Tests/Functional/SwiftTestTests.swift

@@ -34,30 +34,17 @@ class SwiftTestTests: XCTestCase {
                     ranFirstTest = exploded.contains("Test Case '-[SwiftTestModuleTestSuite.SwiftTestModuleTests testGiveNumber]' started.")
                     ranSecondTest = exploded.contains("Test Case '-[SwiftTestModuleTestSuite.SwiftTestModuleTests testGiveNumber2]' started.")
                 #else
-                    ranFirstTest = !exploded.filter { self.string($0, hasPrefix:"Test Case \'SwiftTestModuleTests.testGiveNumber\' started") }.isEmpty
-                    ranSecondTest = !exploded.filter { self.string($0, hasPrefix:"Test Case \'SwiftTestModuleTests.testGiveNumber2\' started") }.isEmpty
+                    func outputContains(_ str: String) -> Bool {
+                        return !exploded.filter { $0.characters.starts(with: str.characters) }.isEmpty
+                    }
+                    ranFirstTest = outputContains("Test Case \'SwiftTestModuleTests.testGiveNumber\' started")
+                    ranSecondTest = outputContains("Test Case \'SwiftTestModuleTests.testGiveNumber2\' started")
                 #endif
             }
             XCTAssertEqual(ranFirstTest, true, "First test did not run")
             XCTAssertEqual(ranSecondTest, false, "Second test ran")
         }
     }
-    
-    // FIXME: Copy pasted from libc/String+Linux.swift because swiftc errors out saying:
-    // `ambiguous use of 'hasPrefix'` found in `Foundation.String` and `libc.String`.
-    // This is probably because XCTest imports Foundation and libc is imported in other
-    // parts of Funtional testsuite.
-    private func string(_ prefix: String, hasPrefix str: String) -> Bool {
-        if prefix.utf8.count < str.utf8.count {
-            return false
-        }
-        for i in 0..<str.utf8.count {
-            if prefix.utf8[prefix.utf8.startIndex.advanced(by: i)] != str.utf8[str.utf8.startIndex.advanced(by: i)] {
-                return false
-            }
-        }
-        return true
-    }
 }
 
 extension SwiftTestTests {

Tests/Functional/Utilities.swift

@@ -98,16 +98,28 @@ enum Configuration {
 
 private var globalSymbolInMainBinary = 0
 
+private enum SwiftExecutable: String {
+    case Build = "swift-build"
+    case Test = "swift-test"
+}
+
+private func executablePath(exe: SwiftExecutable) -> String {
+    #if os(OSX)
+        for bundle in NSBundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
+            return Path.join(bundle.bundlePath.parentDirectory, exe.rawValue)
+        }
+        fatalError()
+    #else
+        return Path.join(Process.arguments.first!.abspath().parentDirectory, exe.rawValue)
+    #endif
+}
 
 func swiftBuildPath() -> String {
-#if os(OSX)
-    for bundle in NSBundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
-        return Path.join(bundle.bundlePath.parentDirectory, "swift-build")
-    }
-    fatalError()
-#else
-    return Path.join(Process.arguments.first!.abspath().parentDirectory, "swift-build")
-#endif
+    return executablePath(exe: .Build)
+}
+
+func swiftTestPath() -> String {
+    return executablePath(exe: .Test)
 }
 
 
@@ -155,17 +167,6 @@ func executeSwiftBuild(_ chdir: String, configuration: Configuration = .Debug, p
     }
 }
 
-func swiftTestPath() -> String {
-    #if os(OSX)
-        for bundle in NSBundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
-            return Path.join(bundle.bundlePath.parentDirectory, "swift-test")
-        }
-        fatalError()
-    #else
-        return Path.join(Process.arguments.first!.abspath().parentDirectory, "swift-test")
-    #endif
-}
-
 func executeSwiftTest(_ chdir: String, printIfError: Bool = false, additionalArgs: [String] = []) throws -> String {
     let args = [swiftTestPath(), "--chdir", chdir] + additionalArgs
     var out = ""