[php-src] master: fix: isolate rmdir test fixtures (#23225)

Author: NickSdot (NickSdot)
Committer: GitHub (web-flow)
Pusher: arnaud-lb
Date: 2026-08-12T12:03:16+02:00

Commit: https://github.com/php/php-src/commit/b255ef686aff12a05262f963b7dc9c02c3f98a2a
Raw diff: https://github.com/php/php-src/commit/b255ef686aff12a05262f963b7dc9c02c3f98a2a.diff

fix: isolate rmdir test fixtures (#23225)

Changed paths:
  M  ext/standard/tests/file/rmdir_variation3-win32.phpt
  M  ext/standard/tests/file/rmdir_variation3.phpt


Diff:

diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt
index 4f39ae5caf4d..154daf8c6810 100644
--- a/ext/standard/tests/file/rmdir_variation3-win32.phpt
+++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt
@@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 <?php
 echo "*** Testing rmdir() : variation ***\n";
 
-$workDir = "rmdirVar3.tmp";
+$workDir = "rmdirVar3Win32.tmp";
 $subDir = "aSubDir";
 mkdir($workDir);
 $cwd = getcwd();
@@ -62,39 +62,42 @@ foreach($dirs as $dir) {
    }
 }
 
-rmdir($workDir);
-
+?>
+--CLEAN--
+<?php
+@rmdir("rmdirVar3Win32.tmp/aSubDir");
+@rmdir("rmdirVar3Win32.tmp");
 ?>
 --EXPECTF--
 *** Testing rmdir() : variation ***
--- removing rmdirVar3.tmp\aSubDir --
+-- removing rmdirVar3Win32.tmp\aSubDir --
 Directory removed
--- removing .\rmdirVar3.tmp\aSubDir --
+-- removing .\rmdirVar3Win32.tmp\aSubDir --
 Directory removed
--- removing rmdirVar3.tmp\..\rmdirVar3.tmp\aSubDir --
+-- removing rmdirVar3Win32.tmp\..\rmdirVar3Win32.tmp\aSubDir --
 Directory removed
--- removing rmdirVar3.tmp\..\BADDIR\aSubDir --
+-- removing rmdirVar3Win32.tmp\..\BADDIR\aSubDir --
 
 Warning: rmdir(): No such file or directory in %s on line %d
 -- removing BADDIR\aSubDir --
 
 Warning: rmdir(): No such file or directory in %s on line %d
--- removing %s\rmdirVar3.tmp\aSubDir --
+-- removing %s\rmdirVar3Win32.tmp\aSubDir --
 Directory removed
--- removing %s\.\rmdirVar3.tmp\aSubDir --
+-- removing %s\.\rmdirVar3Win32.tmp\aSubDir --
 Directory removed
--- removing %s\rmdirVar3.tmp\..\rmdirVar3.tmp\aSubDir --
+-- removing %s\rmdirVar3Win32.tmp\..\rmdirVar3Win32.tmp\aSubDir --
 Directory removed
 -- removing %s\BADDIR\aSubDir --
 
 Warning: rmdir(): No such file or directory in %s on line %d
--- removing rmdirVar3.tmp\aSubDir\ --
+-- removing rmdirVar3Win32.tmp\aSubDir\ --
 Directory removed
--- removing %s\rmdirVar3.tmp\aSubDir\ --
+-- removing %s\rmdirVar3Win32.tmp\aSubDir\ --
 Directory removed
--- removing rmdirVar3.tmp\\aSubDir --
+-- removing rmdirVar3Win32.tmp\\aSubDir --
 Directory removed
--- removing %s\\rmdirVar3.tmp\\aSubDir --
+-- removing %s\\rmdirVar3Win32.tmp\\aSubDir --
 Directory removed
--- removing /%s/rmdirVar3.tmp/aSubDir --
+-- removing /%s/rmdirVar3Win32.tmp/aSubDir --
 Directory removed
diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt
index 3e8cea123805..5f39f221ecf6 100644
--- a/ext/standard/tests/file/rmdir_variation3.phpt
+++ b/ext/standard/tests/file/rmdir_variation3.phpt
@@ -52,8 +52,11 @@ foreach($dirs as $dir) {
    }
 }
 
-rmdir($workDir);
-
+?>
+--CLEAN--
+<?php
+@rmdir("rmdirVar3.tmp/aSubDir");
+@rmdir("rmdirVar3.tmp");
 ?>
 --EXPECTF--
 *** Testing rmdir() : variation ***