Commit b255ef686af for php.net
commit b255ef686aff12a05262f963b7dc9c02c3f98a2a
Author: NickSdot <32384907+NickSdot@users.noreply.github.com>
Date: Wed Aug 12 17:03:16 2026 +0700
fix: isolate rmdir test fixtures (#23225)
diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt
index 4f39ae5caf4..154daf8c681 100644
--- a/ext/standard/tests/file/rmdir_variation3-win32.phpt
+++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt
@@ -11,7 +11,7 @@
<?php
echo "*** Testing rmdir() : variation ***\n";
-$workDir = "rmdirVar3.tmp";
+$workDir = "rmdirVar3Win32.tmp";
$subDir = "aSubDir";
mkdir($workDir);
$cwd = getcwd();
@@ -62,39 +62,42 @@
}
}
-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 3e8cea12380..5f39f221ecf 100644
--- a/ext/standard/tests/file/rmdir_variation3.phpt
+++ b/ext/standard/tests/file/rmdir_variation3.phpt
@@ -52,8 +52,11 @@
}
}
-rmdir($workDir);
-
+?>
+--CLEAN--
+<?php
+@rmdir("rmdirVar3.tmp/aSubDir");
+@rmdir("rmdirVar3.tmp");
?>
--EXPECTF--
*** Testing rmdir() : variation ***