Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions ext/standard/tests/file/rmdir_variation3-win32.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
7 changes: 5 additions & 2 deletions ext/standard/tests/file/rmdir_variation3.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ foreach($dirs as $dir) {
}
}

rmdir($workDir);

?>
--CLEAN--
<?php
@rmdir("rmdirVar3.tmp/aSubDir");
@rmdir("rmdirVar3.tmp");
?>
--EXPECTF--
*** Testing rmdir() : variation ***
Expand Down
Loading