Testing...

Author: neonichu

Sources/Workspace/DefaultPluginScriptRunner.swift

@@ -17,6 +17,7 @@ import PackageModel
 import SPMBuildCore
 import TSCBasic
 
+import struct TSCUtility.SerializedDiagnostics
 import struct TSCUtility.Triple
 
 /// A plugin script runner that compiles the plugin source files as an executable binary for the host platform, and invokes it as a subprocess.
@@ -121,6 +122,8 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
 
         // We use the toolchain's Swift compiler for compiling the plugin.
         var commandLine = [self.toolchain.swiftCompilerPathForManifests.pathString]
+        
+        observabilityScope.emit(debug: "Using compiler \(self.toolchain.swiftCompilerPathForManifests.pathString)")
 
         // Get access to the path containing the PackagePlugin module and library.
         let pluginLibraryPath = self.toolchain.swiftPMLibrariesLocation.pluginLibraryPath
@@ -208,6 +211,8 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
         if (verboseOutput) {
             commandLine.append("-v")
         }
+
+        observabilityScope.emit(debug: "Using command line \(commandLine)")
 
         // Pass through the compilation environment.
         let environment = toolchain.swiftCompilerEnvironment
@@ -363,6 +368,10 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
                     compilerOutput: compilerOutput,
                     cached: false)
 
+                let diaFileContents = try localFileSystem.readFileContents(result.diagnosticsFile)
+                let diagnosticsSet = try SerializedDiagnostics(bytes: diaFileContents)
+                observabilityScope.emit(debug: "Got serialized diagnostics: \(diagnosticsSet.diagnostics) from \(result.diagnosticsFile)")
+
                 // Tell the delegate that we're done compiling the plugin, passing it the result.
                 delegate.didCompilePlugin(result: result)
 

Tests/SPMBuildCoreTests/PluginInvocationTests.swift

@@ -413,7 +413,7 @@ class PluginInvocationTests: XCTestCase {
                 // Check the serialized diagnostics. We should no longer have an error but now have a warning.
                 let diaFileContents = try localFileSystem.readFileContents(result.diagnosticsFile)
                 let diagnosticsSet = try SerializedDiagnostics(bytes: diaFileContents)
-                XCTAssertEqual(diagnosticsSet.diagnostics.count, 1)
+                XCTAssertEqual(diagnosticsSet.diagnostics.count, 1, "unexpected diagnostics count in \(diagnosticsSet.diagnostics) from \(result.diagnosticsFile.pathString)")
                 let warningDiagnostic = try XCTUnwrap(diagnosticsSet.diagnostics.first)
                 XCTAssertTrue(warningDiagnostic.text.hasPrefix("variable \'unused\' was never used"), "\(warningDiagnostic)")