wip

Author: tomerd

Fixtures/Miscellaneous/TestableExe/Tests/TestableExeTests/TestableExeTests.swift

@@ -1,6 +1,6 @@
 import XCTest
-import TestableExe1
-import TestableExe2
+@testable import TestableExe1
+@testable import TestableExe2
 // import TestableExe3
 import class Foundation.Bundle
 
@@ -9,7 +9,7 @@ final class TestableExeTests: XCTestCase {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
         // results.
-        
+
         print(GetGreeting1())
         XCTAssertEqual(GetGreeting1(), "Hello, world")
         print(GetGreeting2())

Sources/LLBuildManifest/BuildManifest.swift

@@ -51,7 +51,7 @@ public struct BuildManifest {
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = PhonyTool(inputs: inputs, outputs: outputs)
         commands[name] = Command(name: name, tool: tool)
     }
@@ -61,7 +61,7 @@ public struct BuildManifest {
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = TestDiscoveryTool(inputs: inputs, outputs: outputs)
         commands[name] = Command(name: name, tool: tool)
     }
@@ -71,7 +71,7 @@ public struct BuildManifest {
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = CopyTool(inputs: inputs, outputs: outputs)
         commands[name] = Command(name: name, tool: tool)
     }
@@ -81,7 +81,7 @@ public struct BuildManifest {
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = PackageStructureTool(inputs: inputs, outputs: outputs)
         commands[name] = Command(name: name, tool: tool)
     }
@@ -91,7 +91,7 @@ public struct BuildManifest {
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = ArchiveTool(inputs: inputs, outputs: outputs)
         commands[name] = Command(name: name, tool: tool)
     }
@@ -106,7 +106,7 @@ public struct BuildManifest {
         workingDirectory: String? = nil,
         allowMissingInputs: Bool = false
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = ShellTool(
             description: description,
             inputs: inputs,
@@ -127,7 +127,7 @@ public struct BuildManifest {
         outputs: [Node],
         arguments: [String]
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = SwiftFrontendTool(
                 moduleName: moduleName,
                 description: description,
@@ -146,7 +146,7 @@ public struct BuildManifest {
         arguments: [String],
         dependencies: String? = nil
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = ClangTool(
             description: description,
             inputs: inputs,
@@ -173,7 +173,7 @@ public struct BuildManifest {
         isLibrary: Bool,
         wholeModuleOptimization: Bool
     ) {
-        assert(commands[name] == nil, "aleady had a command named '\(name)'")
+        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = SwiftCompilerTool(
             inputs: inputs,
             outputs: outputs,

Tests/CommandsTests/TestToolTests.swift

@@ -61,20 +61,22 @@ final class TestToolTests: CommandsTestCase {
 
     func testEnableDisableTestability() {
         fixture(name: "Miscellaneous/TestableExe") { path in
+            // default should run with testability
             do {
                 let result = try execute(["--vv"], packagePath: path)
-                // default should run with testability
                 XCTAssertMatch(result.stdout, .contains("-enable-testing"))
             }
 
+            // disabled
             do {
-                // disable
                 let result = try execute(["--disable-testable-imports", "--vv"], packagePath: path)
-                XCTAssertNoMatch(result.stdout, .contains("-enable-testing"))
+            } catch SwiftPMProductError.executionFailure(_, let stdout, _) {
+                XCTAssertNoMatch(stdout, .contains("-enable-testing"))
+                XCTAssertMatch(stdout, .contains("was not compiled for testing"))
             }
 
+            // enabled
             do {
-                // enable
                 let result = try execute(["--enable-testable-imports", "--vv"], packagePath: path)
                 XCTAssertMatch(result.stdout, .contains("-enable-testing"))
             }