Skip to content

Commit 251e948

Browse files
committed
Fix some directory collisions in dir tests
1 parent c937c55 commit 251e948

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

ext/standard/tests/dir/opendir_basic.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Test opendir() function : basic functionality
1313

1414
echo "*** Testing opendir() : basic functionality ***\n";
1515

16-
$base_dir_path = dirname(__FILE__);
16+
$base_dir_path = __DIR__ . '/opendir_basic';
17+
@mkdir($base_dir_path);
1718

1819
$level_one_dir_name = "level_one";
1920
$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
@@ -42,9 +43,10 @@ var_dump($dh2);
4243
===DONE===
4344
--CLEAN--
4445
<?php
45-
$file_path = dirname(__FILE__);
46-
rmdir("$file_path/level_one/level_two");
47-
rmdir("$file_path/level_one");
46+
$base_dir_path = __DIR__ . '/opendir_basic';
47+
rmdir("$base_dir_path/level_one/level_two");
48+
rmdir("$base_dir_path/level_one");
49+
rmdir($base_dir_path);
4850
?>
4951
--EXPECTF--
5052
*** Testing opendir() : basic functionality ***

ext/standard/tests/dir/opendir_variation4.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Test opendir() function : usage variations - different relative paths
1313

1414
echo "*** Testing opendir() : usage variation ***\n";
1515

16-
$base_dir_path = dirname(__FILE__);
16+
$base_dir_path = __DIR__ . '/opendir_variation4';
17+
@mkdir($base_dir_path);
1718

1819
$level_one_dir_name = "level_one";
1920
$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
@@ -72,9 +73,10 @@ function clean_dh($dh){
7273
===DONE===
7374
--CLEAN--
7475
<?php
75-
$file_path = dirname(__FILE__);
76-
rmdir("$file_path/level_one/level_two");
77-
rmdir("$file_path/level_one");
76+
$base_dir_path = __DIR__ . '/opendir_variation4';
77+
rmdir("$base_dir_path/level_one/level_two");
78+
rmdir("$base_dir_path/level_one");
79+
rmdir($base_dir_path);
7880
?>
7981
--EXPECTF--
8082
*** Testing opendir() : usage variation ***

ext/standard/tests/dir/scandir_variation4.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ echo "*** Testing scandir() : usage variations ***\n";
1616
// include for create_files/delete_files functions
1717
include (dirname(__FILE__) . '/../file/file.inc');
1818

19-
$base_dir_path = dirname(__FILE__);
19+
$base_dir_path = __DIR__ . '/scandir_variation4';
20+
@mkdir($base_dir_path);
2021

2122
$level_one_dir_path = "$base_dir_path/level_one";
2223
$level_two_dir_path = "$level_one_dir_path/level_two";
@@ -61,9 +62,10 @@ var_dump(scandir('../../level_one'));
6162
===DONE===
6263
--CLEAN--
6364
<?php
64-
$dir_path = dirname(__FILE__);
65-
rmdir("$dir_path/level_one/level_two");
66-
rmdir("$dir_path/level_one");
65+
$base_dir_path = __DIR__ . '/scandir_variation4';
66+
rmdir("$base_dir_path/level_one/level_two");
67+
rmdir("$base_dir_path/level_one");
68+
rmdir($base_dir_path);
6769
?>
6870
--EXPECT--
6971
*** Testing scandir() : usage variations ***

0 commit comments

Comments
 (0)