shifathosn
/
rea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(apple): skip ibtool-compiled NIB tests when Xcode ibtool is unavailable (#2070) 

Command Line Tools install the /usr/bin/ibtool and xcrun shims without ibtool itself, so the existing /usr/bin/ibtool existence guard never skipped the storyboard test, and the native NIB hierarchy suite had no guard. On a Command Line Tools-only macOS host these seven tests failed at fixture compilation. Probe xcrun --find ibtool once and use it for both suites.
This commit is contained in:
TonyWu 2026-10-13 05:07:16 +08:00 committed by GitHub
parent 5c2956587a
commit 7bc57e1e64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/boundary/filesystem/interfaceBuilderBundle.test.ts
View File

@ -1,4 +1,3 @@
import { existsSync } from "node:fs";
import { execFile } from "node:child_process";
import { mkdir, writeFile } from "node:fs/promises";
import { join } from "node:path";
@ -10,6 +9,7 @@ import { describe, expect, it } from "vitest";
import { analyzeInterfaceBuilderBundle } from "../../../src/artifacts/apple/InterfaceBuilderAnalysis.js";
import { encodeNibArchiveFixture } from "../../../src/artifacts/apple/NibArchive.fixture.js";
import { thinMach } from "../../../src/domain/binaryTarget.fixture.js";
import { xcodeIbtoolAvailable } from "../../fixtures/ibtool.js";
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
import { interfaceBuilderAnalysisSchema } from "../../../src/domain/apple/interfaceBuilderGraph.js";
@ -913,7 +913,7 @@ describe("bounded Interface Builder archive decoding", () => {
);
});
it.skipIf(process.platform !== "darwin" || !existsSync("/usr/bin/ibtool"))(
it.skipIf(!xcodeIbtoolAvailable)(
"decodes an Xcode-compiled storyboard NIB and recovers its UI routes",
async () => {
const root = await createTestTempDirectory("rea-ib-compiled-test-");

3
tests/boundary/filesystem/nibNativeHierarchy.test.ts
View File

@ -5,6 +5,7 @@ import { promisify } from "node:util";
import { describe, expect, it } from "vitest";
import { xcodeIbtoolAvailable } from "../../fixtures/ibtool.js";
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
import { decodeNibArchive } from "../../../src/artifacts/apple/NibArchive.js";
import { analyzeInterfaceBuilderBundle } from "../../../src/artifacts/apple/InterfaceBuilderAnalysis.js";
@ -57,7 +58,7 @@ const compileNestedViews = async (depth: number, withWindow = false) => {
return { bundle, archive: decodeNibArchive(await readFile(nib)) };
};
describe.skipIf(process.platform !== "darwin")(
describe.skipIf(!xcodeIbtoolAvailable)(
"native compiled NIB view hierarchy",
() => {
it.each([4, 40])(

11
tests/fixtures/ibtool.ts vendored Normal file
View File

@ -0,0 +1,11 @@
import { spawnSync } from "node:child_process";
/**
* Whether Xcode's ibtool can compile Interface Builder sources on this host.
* Command Line Tools install the /usr/bin/ibtool and xcrun shims without the
* tool itself, so probe resolution instead of checking the shim path.
*/
export const xcodeIbtoolAvailable =
process.platform === "darwin" &&
spawnSync("/usr/bin/xcrun", ["--find", "ibtool"], { stdio: "ignore" })
.status === 0;