Skip to content

Commit 06ad04f

Browse files
committed
Instead of querying target info in test, verify it was successfully received
1 parent 2e40337 commit 06ad04f

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ internal extension swiftscan_diagnostic_severity_t {
319319
api.swiftscan_string_set_dispose != nil
320320
}
321321

322-
@_spi(Testing) public func queryTargetInfo(invocationCommand: [String])
323-
throws -> FrontendTargetInfo {
322+
func queryTargetInfo(invocationCommand: [String]) throws -> FrontendTargetInfo {
324323
// Create and configure the scanner invocation
325324
let invocation = api.swiftscan_scan_invocation_create()
326325
defer { api.swiftscan_scan_invocation_dispose(invocation) }
@@ -334,18 +333,23 @@ internal extension swiftscan_diagnostic_severity_t {
334333
print("--> ResultData: \(targetInfoData)")
335334
let info = try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
336335
print("--> Result info: \(info)")
337-
let verifiedInfo = verifyTargetInfo(info)
338-
print("--> Verified Result info: \(info)")
339-
return verifiedInfo
336+
return info
340337
}
341338

342-
private func verifyTargetInfo(_ info: FrontendTargetInfo) -> FrontendTargetInfo {
343-
print("<<< Verifying Target Info >>>")
344-
print(info.compilerVersion)
345-
print(info.paths)
346-
print(info.target)
347-
print("<<< --------------------- >>>")
348-
return info
339+
340+
@_spi(Testing) public func verifyBeingAbleToQueryTargetInfo(invocationCommand: [String]) throws -> Bool {
341+
do {
342+
let targetInfo = try queryTargetInfo(invocationCommand: invocationCommand)
343+
print("<<< Verifying Target Info >>>")
344+
print(targetInfo.compilerVersion)
345+
print(targetInfo.paths)
346+
print(targetInfo.target)
347+
print("<<< --------------------- >>>")
348+
} catch {
349+
print(error)
350+
return false
351+
}
352+
return true
349353
}
350354
}
351355

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4800,7 +4800,7 @@ final class SwiftDriverTests: XCTestCase {
48004800
if libSwiftScanInstance.canQueryTargetInfo() {
48014801
do {
48024802
print("Library able to query target info")
4803-
let targetInfo = try libSwiftScanInstance.queryTargetInfo(invocationCommand: targetInfoArgs)
4803+
try XCTAssertTrue(libSwiftScanInstance.verifyBeingAbleToQueryTargetInfo(invocationCommand: targetInfoArgs))
48044804
print("Target Info Query complete. ✅")
48054805
//print(targetInfo.runtimeLibraryImportPaths)
48064806
} catch {

0 commit comments

Comments
 (0)