Merge pull request #160 from aciidb0mb3r/patch-12

Throw error if no test module

Author: mxcl

Sources/swift-test/Error.swift

@@ -10,13 +10,16 @@ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 enum Error: ErrorType {
     case DebugYAMLNotFound
+    case TestsExecutableNotFound
 }
 
 extension Error: CustomStringConvertible {
     var description: String {
         switch self {
         case .DebugYAMLNotFound:
             return "build the package using `swift build` before running tests"
+        case .TestsExecutableNotFound:
+            return "no tests found to execute, create a test-module in `Tests` directory"
         }
     }
 }

Sources/swift-test/main.swift

@@ -27,7 +27,7 @@ do {
     guard yamlPath.exists else { throw Error.DebugYAMLNotFound }
 
     try build(YAMLPath: yamlPath, target: "test")
-    let success = test(dir.build, "debug")
+    let success = try test(dir.build, "debug")
     exit(success ? 0 : 1)
 
 } catch {

Sources/swift-test/test.swift

@@ -11,17 +11,35 @@
 import PackageType
 import Utility
 
-func test(path: String..., args: String? = nil) -> Bool {
+func test(path: String..., args: String? = nil) throws -> Bool {
     let path = Path.join(path)
-    let result: Void?
+    var args: [String] = []
+    let testsPath: String
+
 #if os(OSX)
-    var args = ["xcrun", "xctest"]
+    testsPath = Path.join(path, "Package.xctest")
+    args = ["xcrun", "xctest"]
     args += Process.arguments.dropFirst()
-    args += [Path.join(path, "Package.xctest")]
-    result = try? system(args)
 #else
-    result = try? system(Path.join(path, "test-Package"))
+    testsPath = Path.join(path, "test-Package")
 #endif
-    
+
+    guard testsPath.testExecutableExists else {
+        throw Error.TestsExecutableNotFound
+    }
+
+    args += [testsPath]
+
+    let result: Void? = try? system(args)
     return result != nil
 }
+
+private extension String {
+    var testExecutableExists: Bool {
+        #if os(OSX)
+            return self.isDirectory //Package.xctest is dir on OSX
+        #else
+            return self.isFile //test-Package is executable on OSX
+        #endif
+    }
+}