Skip to content

Commit 03eeec1

Browse files
committed
Fix rename_variation12*.phpt parallel test conflicts
For rename_variation12.phpt this is actually not necessary, since there is no rename_variation11.phpt, but we still fix it to be in sync with rename_variation12-win32.phpt which actually is prone to parallel conflicts. (cherry picked from commit d4263dd)
1 parent e74e66e commit 03eeec1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ext/standard/tests/file/rename_variation12-win32.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows');
1111
/* Creating unique files in various dirs by passing relative paths to $dir arg */
1212

1313
echo "*** Testing rename() with absolute and relative paths ***\n";
14-
$mainDir = "renameVar11";
15-
$subDir = "renameVar11Sub";
14+
$mainDir = "renameVar12";
15+
$subDir = "renameVar12Sub";
1616
$absMainDir = __DIR__."/".$mainDir;
1717
mkdir($absMainDir);
1818
$absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@ bool(true)
8383

8484
-- Iteration 5 --
8585

86-
Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
86+
Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
8787
bool(false)
8888

8989
-- Iteration 6 --
9090

91-
Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
91+
Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
9292
bool(false)
9393

9494
-- Iteration 7 --

ext/standard/tests/file/rename_variation12.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip.. not for Windows');
1111
/* Creating unique files in various dirs by passing relative paths to $dir arg */
1212

1313
echo "*** Testing rename() with absolute and relative paths ***\n";
14-
$mainDir = "renameVar11";
15-
$subDir = "renameVar11Sub";
14+
$mainDir = "renameVar12";
15+
$subDir = "renameVar12Sub";
1616
$absMainDir = __DIR__."/".$mainDir;
1717
mkdir($absMainDir);
1818
$absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@ bool(true)
8383

8484
-- Iteration 5 --
8585

86-
Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): %s in %s on line %d
86+
Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): %s in %s on line %d
8787
bool(false)
8888

8989
-- Iteration 6 --
9090

91-
Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
91+
Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
9292
bool(false)
9393

9494
-- Iteration 7 --

0 commit comments

Comments
 (0)