Instead of querying target info in test, verify it was successfully received

Author: artemcm

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -319,8 +319,7 @@ internal extension swiftscan_diagnostic_severity_t {
            api.swiftscan_string_set_dispose != nil
   }
 
-  @_spi(Testing) public func queryTargetInfo(invocationCommand: [String])
-  throws -> FrontendTargetInfo {
+  func queryTargetInfo(invocationCommand: [String]) throws -> FrontendTargetInfo {
     // Create and configure the scanner invocation
     let invocation = api.swiftscan_scan_invocation_create()
     defer { api.swiftscan_scan_invocation_dispose(invocation) }
@@ -334,18 +333,35 @@ internal extension swiftscan_diagnostic_severity_t {
     print("--> ResultData: \(targetInfoData)")
     let info = try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
     print("--> Result info: \(info)")
-    let verifiedInfo = verifyTargetInfo(info)
-    print("--> Verified Result info: \(info)")
-    return verifiedInfo
+    return info
   }
 
-  private func verifyTargetInfo(_ info: FrontendTargetInfo) -> FrontendTargetInfo {
-    print("<<< Verifying Target Info >>>")
-    print(info.compilerVersion)
-    print(info.paths)
-    print(info.target)
-    print("<<< --------------------- >>>")
-    return info
+
+  @_spi(Testing) public func verifyBeingAbleToQueryTargetInfo(invocationCommand: [String]) -> Bool {
+    do {
+      // Create and configure the scanner invocation
+      let invocation = api.swiftscan_scan_invocation_create()
+      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))
+      let targetInfoData = Data(targetInfoString.utf8)
+      print("--> ResultData: \(targetInfoData)")
+      let info = try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
+      print("--> Result info: \(info)")
+      print("<<< Verifying Target Info >>>")
+      print(info.compilerVersion)
+      print(info.paths)
+      print(info.target)
+      print("<<< --------------------- >>>")
+    } catch {
+      print(error)
+      return false
+    }
+    return true
   }
 }
 

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -4800,7 +4800,7 @@ final class SwiftDriverTests: XCTestCase {
         if libSwiftScanInstance.canQueryTargetInfo() {
           do {
             print("Library able to query target info")
-            let targetInfo = try libSwiftScanInstance.queryTargetInfo(invocationCommand: targetInfoArgs)
+            XCTAssertTrue(libSwiftScanInstance.verifyBeingAbleToQueryTargetInfo(invocationCommand: targetInfoArgs))
             print("Target Info Query complete. ✅")
             //print(targetInfo.runtimeLibraryImportPaths)
           } catch {