Skip to content

Commit ea7459c

Browse files
committed
fix(apple-runner): compare cleanup path segments precisely
1 parent 7195795 commit ea7459c

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎packages/apple-runner/src/runner-cache.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,12 @@ export function assertSafeDerivedCleanup(
316316
function isPathInsideProjectTmp(targetPath: string, projectRoot: string): boolean {
317317
const projectTmpRoot = path.resolve(projectRoot, '.tmp');
318318
const relativePath = path.relative(projectTmpRoot, path.resolve(targetPath));
319-
if (relativePath === '' || relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
319+
if (
320+
relativePath === '' ||
321+
relativePath === '..' ||
322+
relativePath.startsWith('..' + path.sep) ||
323+
path.isAbsolute(relativePath)
324+
) {
320325
return false;
321326
}
322327
let candidate = projectTmpRoot;

‎scripts/__tests__/runner-isolation-diagnostics.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ describe('scripts/build-xcuitest-apple.sh cleanup', () => {
243243
expect(fs.readFileSync(path.join(derived, 'macos', 'sentinel'), 'utf8')).toBe('keep');
244244
});
245245

246-
test('cleans a supported project override', () => {
246+
test('cleans a supported project override whose name starts with dots', () => {
247247
fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
248-
const derived = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'runner-clean-test-'));
248+
const derived = fs.mkdtempSync(path.join(repoRoot, '.tmp', '..runner-clean-test-'));
249249
try {
250250
const result = runBuildScript('', 65, { clean: true, derived });
251251
expect(result.status).toBe(65);

‎test/integration/smoke-clean-xcuitest-derived.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@ for (const platform of ['ios', 'macos']) {
8989
const homeDir = fs.mkdtempSync(
9090
path.join(os.tmpdir(), `agent-device-clean-xcuitest-override-${platform}-`),
9191
);
92-
fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
93-
const overrideRoot = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'clean-xcuitest-'));
92+
let overrideRoot: string | undefined;
9493
try {
94+
fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
95+
overrideRoot = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'clean-xcuitest-'));
9596
const defaultRoot = path.join(homeDir, '.agent-device', 'apple-runner', 'derived');
9697
const defaultPlatformDir = path.join(defaultRoot, 'macos');
9798
fs.mkdirSync(path.join(defaultRoot, 'Build'), { recursive: true });
@@ -114,7 +115,7 @@ for (const platform of ['ios', 'macos']) {
114115
assert.equal(fs.existsSync(path.join(defaultRoot, 'Build')), true);
115116
assert.equal(fs.existsSync(defaultPlatformDir), true);
116117
} finally {
117-
fs.rmSync(overrideRoot, { recursive: true, force: true });
118+
if (overrideRoot !== undefined) fs.rmSync(overrideRoot, { recursive: true, force: true });
118119
fs.rmSync(homeDir, { recursive: true, force: true });
119120
}
120121
});

0 commit comments

Comments
 (0)