Skip to content

Commit 938d258

Browse files
committed
Fix a couple QNX-related test issues
1 parent a0f7bf1 commit 938d258

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

Sources/SWBQNXPlatform/Specs/QNXLibtool.xcspec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
);
6464
IsInputDependency = Yes;
6565
},
66+
{
67+
Name = "LIBTOOL_USE_RESPONSE_FILE";
68+
Type = Boolean;
69+
DefaultValue = YES;
70+
},
6671
);
6772
},
6873
)

Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ import SWBMacro
8282
let toolchains = core.toolchainRegistry.toolchains
8383
#expect(toolchains.count > 0) // must be at least one toolchain (default)
8484
for toolchain in toolchains.sorted(by: \.identifier) {
85+
if toolchain.identifier == "qnx" {
86+
// QNX toolchains do not have clang
87+
continue
88+
}
89+
8590
let clangPath = try #require(toolchain.executableSearchPaths.findExecutable(operatingSystem: core.hostOperatingSystem, basename: "clang"), "Unable to find clang in search paths for toolchain '\(toolchain.identifier)': \(toolchain.executableSearchPaths.environmentRepresentation)")
8691
let info = try await discoveredClangToolInfo(toolPath: clangPath, arch: "undefined_arch", sysroot: nil)
8792
#expect(info.toolPath == clangPath)

Tests/SWBCoreTests/SettingsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ import SWBMacro
17741774
#expect(!core.platformRegistry.platforms.isEmpty)
17751775
for developmentTeam in ["ABCDWXYZ", ""] {
17761776
for platform in core.platformRegistry.platforms {
1777-
if ["android", "linux", "windows"].contains(platform.name) {
1777+
if ["android", "linux", "qnx", "windows"].contains(platform.name) {
17781778
continue
17791779
}
17801780
for sdk in platform.sdks {

0 commit comments

Comments
 (0)