[DNM] Diagnostic prints

Author: artemcm

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -323,15 +323,23 @@ internal extension swiftscan_diagnostic_severity_t {
   throws -> FrontendTargetInfo {
     // Create and configure the scanner invocation
     let invocation = api.swiftscan_scan_invocation_create()
+    print("--> Invocation Created")
     defer { api.swiftscan_scan_invocation_dispose(invocation) }
     withArrayOfCStrings(invocationCommand) { invocationStringArray in
       api.swiftscan_scan_invocation_set_argv(invocation,
                                              Int32(invocationCommand.count),
                                              invocationStringArray)
     }
-    let targetInfoString = try toSwiftString(api.swiftscan_compiler_target_info_query(invocation))
+    print("--> ARGV: \(invocationCommand.joined(separator:" "))")
+    let result = api.swiftscan_compiler_target_info_query(invocation)
+    print("--> Result: \(result)")
+    let targetInfoString = try toSwiftString(result)
+    print("--> ResultString: \(targetInfoString)")
     let targetInfoData = Data(targetInfoString.utf8)
-    return try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
+    print("--> ResultData: \(targetInfoData)")
+    let info = try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
+    print("--> Result info: \(info)")
+    return info
   }
 }
 

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -4769,9 +4769,14 @@ final class SwiftDriverTests: XCTestCase {
   }
 
   func testPrintTargetInfo() throws {
+    print("Begin testPrintTargetInfo")
+
     do {
+      print("testPrintTargetInfo -> driver 1")
       var driver = try Driver(args: ["swift", "-print-target-info", "-sdk", "bar", "-resource-dir", "baz"])
+      print("testPrintTargetInfo -> planBuild 1")
       let plannedJobs = try driver.planBuild()
+      print("testPrintTargetInfo -> done 1")
       XCTAssertTrue(plannedJobs.count == 1)
       let job = plannedJobs[0]
       XCTAssertEqual(job.kind, .printTargetInfo)
@@ -4783,18 +4788,24 @@ final class SwiftDriverTests: XCTestCase {
 
     do {
       let targetInfoArgs = ["-print-target-info", "-sdk", "bar", "-resource-dir", "baz"]
+      print("testPrintTargetInfo -> driver 2")
       let driver = try Driver(args: ["swift"] + targetInfoArgs)
-
+      print("testPrintTargetInfo -> getScanLibPath")
       let env = ProcessEnv.vars
       let swiftScanLibPath = try Driver.getScanLibPath(of: driver.toolchain,
                                                        hostTriple: driver.hostTriple,
                                                        env: env)
+      print("Attempting to use scanner library at: \(swiftScanLibPath.debugDescription)")
       if localFileSystem.exists(swiftScanLibPath) {
+        print("Library Exists")
         let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
         if libSwiftScanInstance.canQueryTargetInfo() {
-          let _ = try libSwiftScanInstance.queryTargetInfo(invocationCommand: targetInfoArgs)
+          print("Library able to query target info")
+          let targetInfo = try libSwiftScanInstance.queryTargetInfo(invocationCommand: targetInfoArgs)
+          print("Done querying target info")
         }
       }
+      print("testPrintTargetInfo -> done 2")
     }
 
     do {
@@ -4830,6 +4841,7 @@ final class SwiftDriverTests: XCTestCase {
     }
 
     do {
+      print("Sub-test 1")
       XCTAssertThrowsError(try Driver(args: ["swift", "-print-target-info"],
                                       env: ["SWIFT_DRIVER_SWIFT_FRONTEND_EXEC": "/bad/path/to/swift-frontend"])) {
         error in
@@ -4844,9 +4856,11 @@ final class SwiftDriverTests: XCTestCase {
           XCTFail("unexpected error \(error)")
         }
       }
+      print("Sub-test 1 done")
     }
 
     do {
+      print("Sub-test 2")
       var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-apple-ios13.1-macabi", "-target-variant", "x86_64-apple-macosx10.14", "-sdk", "bar", "-resource-dir", "baz"])
       let plannedJobs = try driver.planBuild()
       XCTAssertTrue(plannedJobs.count == 1)
@@ -4857,9 +4871,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertTrue(job.commandLine.contains(.flag("-target-variant")))
       XCTAssertTrue(job.commandLine.contains(.flag("-sdk")))
       XCTAssertTrue(job.commandLine.contains(.flag("-resource-dir")))
+      print("Sub-test 2 done")
     }
 
     do {
+      print("Sub-test 3")
       var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux"])
       let plannedJobs = try driver.planBuild()
       XCTAssertTrue(plannedJobs.count == 1)
@@ -4868,9 +4884,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
       XCTAssertTrue(job.commandLine.contains(.flag("-target")))
       XCTAssertFalse(job.commandLine.contains(.flag("-use-static-resource-dir")))
+      print("Sub-test 3 done ")
     }
 
     do {
+      print("Sub-test 4")
       var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux", "-static-stdlib"])
       let plannedJobs = try driver.planBuild()
       XCTAssertTrue(plannedJobs.count == 1)
@@ -4879,9 +4897,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
       XCTAssertTrue(job.commandLine.contains(.flag("-target")))
       XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
+      print("Sub-test 4 done")
     }
 
     do {
+      print("Sub-test 5")
       var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux", "-static-executable"])
       let plannedJobs = try driver.planBuild()
       XCTAssertTrue(plannedJobs.count == 1)
@@ -4890,6 +4910,7 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
       XCTAssertTrue(job.commandLine.contains(.flag("-target")))
       XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
+      print("Sub-test 5 done")
     }
   }