@@ -84,6 +84,59 @@ test('clean-xcuitest macos removes the entire platform directory when present',
8484 }
8585} ) ;
8686
87+ for ( const platform of [ 'ios' , 'macos' ] ) {
88+ test ( `clean-xcuitest ${ platform } cleans the override directory and leaves the default untouched` , ( ) => {
89+ const homeDir = fs . mkdtempSync (
90+ path . join ( os . tmpdir ( ) , `agent-device-clean-xcuitest-override-${ platform } -` ) ,
91+ ) ;
92+ try {
93+ const defaultRoot = path . join ( homeDir , '.agent-device' , 'apple-runner' , 'derived' ) ;
94+ const defaultPlatformDir = path . join ( defaultRoot , 'macos' ) ;
95+ fs . mkdirSync ( path . join ( defaultRoot , 'Build' ) , { recursive : true } ) ;
96+ fs . mkdirSync ( defaultPlatformDir , { recursive : true } ) ;
97+ const overrideRoot = path . join ( homeDir , 'worktree' , '.tmp' , 'ios-runner-derived' ) ;
98+ fs . mkdirSync ( path . join ( overrideRoot , 'Build' ) , { recursive : true } ) ;
99+ fs . mkdirSync ( path . join ( overrideRoot , 'Logs' ) , { recursive : true } ) ;
100+ fs . writeFileSync ( path . join ( overrideRoot , '.agent-device-runner-cache.json' ) , '{}' , 'utf8' ) ;
101+ fs . mkdirSync ( path . join ( overrideRoot , 'user-data' ) , { recursive : true } ) ;
102+
103+ const result = runCleanXcuitest ( homeDir , platform , {
104+ env : { AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH : ` ${ overrideRoot } / ` } ,
105+ } ) ;
106+ const label = platform === 'ios' ? 'iOS' : 'macOS' ;
107+ assert . equal ( result . exitCode , 0 , result . stderr ) ;
108+ assert . equal (
109+ result . stdout . trim ( ) ,
110+ `Removed ${ label } XCTest transient entries under ${ overrideRoot } : .agent-device-runner-cache.json, Build, Logs; kept user-data` ,
111+ ) ;
112+ assert . deepEqual ( fs . readdirSync ( overrideRoot ) , [ 'user-data' ] ) ;
113+ assert . equal ( fs . existsSync ( path . join ( defaultRoot , 'Build' ) ) , true ) ;
114+ assert . equal ( fs . existsSync ( defaultPlatformDir ) , true ) ;
115+ } finally {
116+ fs . rmSync ( homeDir , { recursive : true , force : true } ) ;
117+ }
118+ } ) ;
119+ }
120+
121+ test ( 'clean-xcuitest ignores a blank override and keeps the default directory' , ( ) => {
122+ const homeDir = fs . mkdtempSync ( path . join ( os . tmpdir ( ) , 'agent-device-clean-xcuitest-blank-' ) ) ;
123+ try {
124+ const derivedRoot = path . join ( homeDir , '.agent-device' , 'apple-runner' , 'derived' ) ;
125+ fs . mkdirSync ( path . join ( derivedRoot , 'Build' ) , { recursive : true } ) ;
126+
127+ const result = runCleanXcuitest ( homeDir , 'ios' , {
128+ env : { AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH : ' ' } ,
129+ } ) ;
130+ assert . equal ( result . exitCode , 0 , result . stderr ) ;
131+ assert . equal (
132+ result . stdout . trim ( ) ,
133+ `Removed iOS XCTest transient entries under ${ derivedRoot } : Build` ,
134+ ) ;
135+ } finally {
136+ fs . rmSync ( homeDir , { recursive : true , force : true } ) ;
137+ }
138+ } ) ;
139+
87140// Root bypasses directory permissions, so chmod cannot force the cleanup
88141// failure this test provokes (common in containerized agent environments).
89142const isRoot = process . getuid ?.( ) === 0 ;
@@ -112,15 +165,20 @@ test(
112165 } ,
113166) ;
114167
115- function runCleanXcuitest ( homeDir : string , ...args : Array < string | { allowFailure ?: boolean } > ) {
168+ function runCleanXcuitest (
169+ homeDir : string ,
170+ ...args : Array < string | { allowFailure ?: boolean ; env ?: Record < string , string > } >
171+ ) {
116172 const lastArg = args . at ( - 1 ) ;
117173 const options = typeof lastArg === 'object' ? lastArg : { } ;
118174 const platforms = ( options === lastArg ? args . slice ( 0 , - 1 ) : args ) as string [ ] ;
119175 return runCmdSync ( process . execPath , [ scriptPath , ...platforms ] , {
120176 cwd : repoRoot ,
121177 env : {
122178 ...process . env ,
179+ AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH : undefined ,
123180 HOME : homeDir ,
181+ ...options ?. env ,
124182 } ,
125183 allowFailure : options ?. allowFailure ,
126184 timeoutMs : 30_000 ,
0 commit comments