[swift-test] Now using Package.test's real names

Author: czechboy0

Sources/Build/misc.swift

@@ -36,7 +36,9 @@ extension CModule {
 
 extension Product {
     var Info: (_: Void, plist: String) {
-        let bundleExecutable = "Package"
+        precondition(isTest)
+
+        let bundleExecutable = name
         let bundleID = "org.swift.pm.\(name)"
         let bundleName = name
 

Sources/Transmute/Package+products.swift

@@ -28,9 +28,8 @@ extension Package {
 
         if !testModules.isEmpty {
             let modules: [SwiftModule] = testModules.map{$0} // or linux compiler crash (2016-02-03)
-            //TODO name should be package name
             //TODO and then we should prefix all modules with their package probably
-            let product = Product(name: "Package", type: .Test, modules: modules)
+            let product = Product(name: self.name, type: .Test, modules: modules)
             products.append(product)
         }
 

Sources/swift-test/main.swift

@@ -21,11 +21,14 @@ do {
         usage()
     case .Run(let xctestArg):
         let dir = try directories()
+
+        //FIXME find a reliable name to detect the name of the root test Package
+        let testPackageName = dir.root.basename
         let yamlPath = Path.join(dir.build, "debug.yaml")
         guard yamlPath.exists else { throw Error.DebugYAMLNotFound }
 
         try build(YAMLPath: yamlPath, target: "test")
-        let success = try test(dir.build, "debug", xctestArg: xctestArg)
+        let success = try test(dir.build, "debug", testPackageName: testPackageName, xctestArg: xctestArg)
         exit(success ? 0 : 1)
     }
 } catch {

Sources/swift-test/test.swift

@@ -11,20 +11,20 @@
 import PackageType
 import Utility
 
-func test(path: String..., xctestArg: String? = nil) throws -> Bool {
+func test(path: String..., testPackageName: String, xctestArg: String? = nil) throws -> Bool {
     let path = Path.join(path)
     var args: [String] = []
     let testsPath: String
 
 #if os(OSX)
-    testsPath = Path.join(path, "Package.xctest")
+    testsPath = Path.join(path, "\(testPackageName).xctest")
     args = ["xcrun", "xctest"]
     if let xctestArg = xctestArg {
         args += ["-XCTest", xctestArg]
     }
     args += [testsPath]
 #else
-    testsPath = Path.join(path, "test-Package")
+    testsPath = Path.join(path, "test-\(testPackageName)")
     args += [testsPath]
     if let xctestArg = xctestArg {
         args += [xctestArg]