Skip to content

Fix windows rename test directories clashing #14554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix windows rename test directories clashing #14554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ext/standard/tests/file/rename_variation-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ require __DIR__.'/file.inc';

/* create directory */
$file_path = __DIR__;
mkdir("$file_path/rename_variation");
mkdir("$file_path/rename_variation-win32");

/* rename files across directories */
echo "*** Testing rename() : rename files across directories ***\n";
$src_filenames = array(
"$file_path/rename_variation/rename_variation.tmp",
"$file_path/rename_variation-win32/rename_variation.tmp",

/* Testing a file trailing slash */
"$file_path/rename_variation/rename_variation.tmp/",
"$file_path/rename_variation-win32/rename_variation.tmp/",

/* Testing file with double slashes */
"$file_path/rename_variation//rename_variation.tmp",
"$file_path//rename_variation//rename_variation.tmp",
"$file_path/rename_variation-win32//rename_variation.tmp",
"$file_path//rename_variation-win32//rename_variation.tmp",
);

$counter = 1;

/* loop through each $file and rename it to rename_variation2.tmp */
foreach($src_filenames as $src_filename) {
echo "-- Iteration $counter --\n";
$fp = fopen("$file_path/rename_variation/rename_variation.tmp", "w");
$fp = fopen("$file_path/rename_variation-win32/rename_variation.tmp", "w");
fclose($fp);
$dest_filename = "$file_path/rename_variation2.tmp";
var_dump( rename($src_filename, $dest_filename) );
Expand All @@ -51,7 +51,7 @@ echo "Done\n";
--CLEAN--
<?php
$file_path = __DIR__;
rmdir($file_path."/rename_variation");
rmdir($file_path."/rename_variation-win32");
?>
--EXPECTF--
*** Testing rename() : rename files across directories ***
Expand All @@ -61,7 +61,7 @@ bool(false)
bool(true)
-- Iteration 2 --

Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
bool(false)
bool(false)
bool(false)
Expand Down
12 changes: 6 additions & 6 deletions ext/standard/tests/file/rename_variation1-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ $file_path = __DIR__;
echo "\n*** Testing rename() : renaming directory across directories ***\n";
$src_dirs = array (
/* Testing simple directory tree */
"$file_path/rename_variation/",
"$file_path/rename_variation1-win32/",

/* Testing a dir with trailing slash */
"$file_path/rename_variation/",
"$file_path/rename_variation1-win32/",

/* Testing dir with double trailing slashes */
"$file_path//rename_variation//",
"$file_path//rename_variation1-win32//",
);

$dest_dir = "$file_path/rename_variation_dir";
$dest_dir = "$file_path/rename_variation1-win32_dir";

// create the $dest_dir
mkdir($dest_dir);
Expand All @@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) {
echo "-- Iteration $counter --\n";

// create the src dir
mkdir("$file_path/rename_variation/");
mkdir("$file_path/rename_variation1-win32/");
// rename the src dir to a new dir in dest dir
var_dump( rename($src_dir, $dest_dir."/new_dir") );
// ensure that dir was renamed
Expand All @@ -55,7 +55,7 @@ echo "Done\n";
--CLEAN--
<?php
$file_path = __DIR__;
rmdir($file_path."/rename_variation_dir");
rmdir($file_path."/rename_variation1-win32_dir");
?>
--EXPECT--
*** Testing rename() : renaming directory across directories ***
Expand Down
Loading