Skip to content

Commit

Permalink
Prevent tempnam tests conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cmb69 committed Aug 7, 2020
1 parent fab2c3b commit fa9bd81
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
14 changes: 7 additions & 7 deletions ext/standard/tests/file/tempnam_variation5-win32.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ if(substr(PHP_OS, 0, 3) != "WIN")
$file_path = __DIR__;

echo "*** Test tempnam() function: by passing an existing filename as prefix ***\n";
$dir_name = $file_path."/tempnam_variation6";
$dir_name = $file_path."/tempnam_variation5";
mkdir($dir_name);
$h = fopen($dir_name."/tempnam_variation6.tmp", "w");
$h = fopen($dir_name."/tempnam_variation5.tmp", "w");

for($i=1; $i<=3; $i++) {
echo "-- Iteration $i --\n";
$created_file = tempnam("$dir_name", "tempnam_variation6.tmp");
$created_file = tempnam("$dir_name", "tempnam_variation5.tmp");

if( file_exists($created_file) ) {
echo "File name is => ";
Expand All @@ -37,18 +37,18 @@ for($i=1; $i<=3; $i++) {
unlink($created_file);
}
fclose($h);
unlink($dir_name."/tempnam_variation6.tmp");
unlink($dir_name."/tempnam_variation5.tmp");
rmdir($dir_name);

echo "\n*** Done ***\n";
?>
--EXPECTF--
*** Test tempnam() function: by passing an existing filename as prefix ***
-- Iteration 1 --
File name is => %stempnam_variation6%et%s
File name is => %stempnam_variation5%et%s
-- Iteration 2 --
File name is => %stempnam_variation6%et%s
File name is => %stempnam_variation5%et%s
-- Iteration 3 --
File name is => %stempnam_variation6%et%s
File name is => %stempnam_variation5%et%s

*** Done ***
34 changes: 17 additions & 17 deletions ext/standard/tests/file/tempnam_variation8-win32.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
/* Creating unique files in various dirs by passing relative paths to $dir arg */

echo "*** Testing tempnam() with absolute and relative paths ***\n";
$dir_name = __DIR__."\\tempnam_variation2";
$dir_name = __DIR__."\\tempnam_variation8";
mkdir($dir_name);
$dir_path = $dir_name."/tempnam_variation2_sub";
$dir_path = $dir_name."/tempnam_variation8_sub";
mkdir($dir_path);

$old_dir_path = getcwd();
Expand All @@ -29,23 +29,23 @@ $dir_paths = array(
"$dir_path\\",
"$dir_path\\..",
"$dir_path\\\\..\\",
"$dir_path\\..\\..\\.\\tempnam_variation2",
"$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2",
"$dir_path\\..\\..\\.\\tempnam_variation8",
"$dir_path\\..\\\\\\tempnam_variation8_sub\\\\..\\\\..\\tempnam_variation8",
"$dir_path\\BADDIR",


// relative paths
"tempname_variation2\\",
"tempnam_variation2\\tempnam_variation2_sub",
"tempnam_variation2\\\\tempnam_variation2_sub",
".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub",
"tempname_variation8\\",
"tempnam_variation8\\tempnam_variation8_sub",
"tempnam_variation8\\\\tempnam_variation8_sub",
".\\tempnam_variation8\\..\\tempnam_variation8\\tempnam_variation8_sub",
"BADDIR",
);

for($i = 0; $i<count($dir_paths); $i++) {
$j = $i+1;
echo "\n-- Iteration $j --\n";
$file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp");
$file_name = tempnam($dir_paths[$i], "tempnam_variation8.tmp");

if( file_exists($file_name) ){

Expand Down Expand Up @@ -90,27 +90,27 @@ echo "\n*** Done ***\n";
*** Testing tempnam() with absolute and relative paths ***

-- Iteration 1 --
File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s
File name is => %s\tempnam_variation8\tempnam_variation8_sub\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 2 --
File name is => %s\tempnam_variation2\t%s
File name is => %s\tempnam_variation8\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 3 --
File name is => %s\tempnam_variation2\t%s
File name is => %s\tempnam_variation8\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 4 --
File name is => %s\tempnam_variation2\t%s
File name is => %s\tempnam_variation8\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 5 --
File name is => %s\tempnam_variation2\t%s
File name is => %s\tempnam_variation8\t%s
File permissions are => 100666
File created in => directory specified

Expand All @@ -129,17 +129,17 @@ File permissions are => 100666
File created in => temp dir

-- Iteration 8 --
File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s
File name is => %s\tempnam_variation8\tempnam_variation8_sub\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 9 --
File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s
File name is => %s\tempnam_variation8\tempnam_variation8_sub\t%s
File permissions are => 100666
File created in => directory specified

-- Iteration 10 --
File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s
File name is => %s\tempnam_variation8\tempnam_variation8_sub\t%s
File permissions are => 100666
File created in => directory specified

Expand Down

0 comments on commit fa9bd81

Please sign in to comment.