Merge branch 'pull-request/320'

* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test

diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index fea539894773379f1d8bb0d20a22b16fb5b04760..c53deacc5f3ddfedb16772d524155b2ee1438b6f 100644 (file)
--- a/ext/bz2/tests/bug51997.phpt
+++ b/ext/bz2/tests/bug51997.phpt
@@ -7,7 +7,7 @@ Bug #51997 (SEEK_CUR with 0 value, returns a warning)
 
 error_reporting(E_ALL);
 
-$filename = "testfile.bz2";
+$filename = "bug51997.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);

diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index 569144593928eb7bd943554d43c16a89dd8098e4..3763398a14d617b045b2965a27209cfb2c426f1b 100644 (file)
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -7,7 +7,7 @@ BZ2 with files
 
 error_reporting(E_ALL);
 
-$filename = "testfile.bz2";
+$filename = "with_files.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);

diff --git a/ext/spl/tests/SplFileInfo_getInode_basic.phpt b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
index 902cbb31c6ffac2159b3cfe8876045738fb5521f..380b865cd2aac96e498535548008b2f0e1c0a9ee 100644 (file)
--- a/ext/spl/tests/SplFileInfo_getInode_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
@@ -16,15 +16,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
 <?php\r
 
 //file
-touch ('test_file_ptfi');
-$fileInfo = new SplFileInfo('test_file_ptfi');
-$result = shell_exec('ls -i test_file_ptfi');
+touch ('SplFileInfo_getInode_basic.txt');
+$fileInfo = new SplFileInfo('SplFileInfo_getInode_basic.txt');
+$result = shell_exec('ls -i SplFileInfo_getInode_basic.txt');
 var_dump($fileInfo->getInode() == $result);
 
 ?>
 --CLEAN--
 <?php
-unlink('test_file_ptfi');
+unlink('SplFileInfo_getInode_basic.txt');
 ?>\r
 --EXPECTF--\r
 bool(true)

diff --git a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
index e9b7beaa97fa9c5d8419ac61603a6cd2a26a795a..53591f34177593f5d8d545e0257463295249e330 100644 (file)
--- a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
@@ -16,15 +16,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
 <?php\r
 
 //file
-touch ('test_file_ptfi');
-chmod('test_file_ptfi', 0557);
-$fileInfo = new SplFileInfo('test_file_ptfi');
+touch ('SplFileInfo_getPerms_basic.txt');
+chmod('SplFileInfo_getPerms_basic.txt', 0557);
+$fileInfo = new SplFileInfo('SplFileInfo_getPerms_basic.txt');
 var_dump($fileInfo->getPerms() == 0100557);
 
 ?>
 --CLEAN--
 <?php
-unlink('test_file_ptfi');
+unlink('SplFileInfo_getPerms_basic.txt');
 ?>\r
 --EXPECTF--\r
 bool(true)

diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt
index 56a039e628e745b70f13c7eb627faf2b7e08f92c..749eefb4c8f38ad180f78ec512ae5ada9217c4d4 100644 (file)
--- a/ext/standard/tests/file/fpassthru_variation.phpt
+++ b/ext/standard/tests/file/fpassthru_variation.phpt
@@ -12,7 +12,7 @@ echo "*** Testing fpassthru() function with files ***\n\n";
 
 echo "--- Testing with different offsets ---\n";
 
-$file_name = dirname(__FILE__)."/passthru.tmp";
+$file_name = dirname(__FILE__)."/passthru_variation.tmp";
 $file_write = fopen($file_name, "w");
 fwrite($file_write, "1234567890abcdefghijklmnopqrstuvwxyz");
 fclose($file_write);

diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt
index 9675d3acae8c1954fbc1b3851ab1c6f5f0321d9c..f2aff597c559b7a4015fd21ede6ed283c0bb7bec 100644 (file)
--- a/ext/standard/tests/file/lchown_basic.phpt
+++ b/ext/standard/tests/file/lchown_basic.phpt
@@ -14,8 +14,8 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()");
  */
 
 echo "*** Testing lchown() : basic functionality ***\n";
-$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic_symlink.txt';
 
 $uid = posix_getuid();
 
@@ -29,8 +29,8 @@ var_dump( fileowner( $symlink ) === $uid );
 --CLEAN--
 <?php
 
-$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic_symlink.txt';
 unlink($filename);
 unlink($symlink);
 

diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt
index be653da29a2edc43a2c8d1b5a3ea15dbd5e5d439..d1a7cebfa7d5ccc3562c0593cf715fa418144ffa 100644 (file)
--- a/ext/standard/tests/file/mkdir-001.phpt
+++ b/ext/standard/tests/file/mkdir-001.phpt
@@ -3,20 +3,20 @@ mkdir() tests
 --FILE--
 <?php
 
-var_dump(mkdir("testdir"));
-var_dump(mkdir("testdir/subdir"));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-001"));
+var_dump(mkdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001"));
 
-var_dump(mkdir("./testdir"));
-var_dump(mkdir("./testdir/subdir"));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-001"));
+var_dump(mkdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir"));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001"));
 
 echo "Done\n";
 ?>

diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt
index ccfd6c3d741ea87328c6bfe3cc1c4eba17d361aa..d149098df07ebd689ccba6c798e4dae8dc8f78dd 100644 (file)
--- a/ext/standard/tests/file/mkdir-002.phpt
+++ b/ext/standard/tests/file/mkdir-002.phpt
@@ -9,24 +9,24 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-var_dump(mkdir("testdir", 0777));
-var_dump(mkdir("testdir/subdir", 0777));
-var_dump(`ls -l testdir`);
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-002", 0777));
+var_dump(mkdir("mkdir-002/subdir", 0777));
+var_dump(`ls -l mkdir-002`);
+var_dump(rmdir("mkdir-002/subdir"));
+var_dump(rmdir("mkdir-002"));
 
-var_dump(mkdir("./testdir", 0777));
-var_dump(mkdir("./testdir/subdir", 0777));
-var_dump(`ls -l ./testdir`);
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-002", 0777));
+var_dump(mkdir("./mkdir-002/subdir", 0777));
+var_dump(`ls -l ./mkdir-002`);
+var_dump(rmdir("./mkdir-002/subdir"));
+var_dump(rmdir("./mkdir-002"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir", 0777));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777));
-$dirname = dirname(__FILE__)."/testdir";
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002", 0777));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002/subdir", 0777));
+$dirname = dirname(__FILE__)."/mkdir-002";
 var_dump(`ls -l $dirname`);
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002"));
 
 echo "Done\n";
 ?>

diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt
index 50ad5e6c4ecc2a1b1501a824037a4f4c0271194f..fdd49f340f003e583c12c2a7ff2a3ed56753785c 100644 (file)
--- a/ext/standard/tests/file/mkdir-003.phpt
+++ b/ext/standard/tests/file/mkdir-003.phpt
@@ -3,17 +3,17 @@ recursive mkdir() tests
 --FILE--
 <?php
 
-var_dump(mkdir("testdir/subdir", 0777, true));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-003/subdir", 0777, true));
+var_dump(rmdir("mkdir-003/subdir"));
+var_dump(rmdir("mkdir-003"));
 
-var_dump(mkdir("./testdir/subdir", 0777, true));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-003/subdir", 0777, true));
+var_dump(rmdir("./mkdir-003/subdir"));
+var_dump(rmdir("./mkdir-003"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777, true));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-003/subdir", 0777, true));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003"));
 
 echo "Done\n";
 ?>

diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt
index 26c3f91f1f9d4c77c81e953b55b8d7fef091ac17..cf2eff8bec3f4919a35cb8305624d84568484693 100644 (file)
--- a/ext/standard/tests/file/tempnam_variation5.phpt
+++ b/ext/standard/tests/file/tempnam_variation5.phpt
@@ -16,13 +16,13 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 $file_path = dirname(__FILE__);
 
 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 => ";
@@ -35,7 +35,7 @@ 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";
@@ -43,10 +43,10 @@ echo "\n*** Done ***\n";
 --EXPECTF--
 *** Test tempnam() function: by passing an existing filename as prefix ***
 -- Iteration 1 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 -- Iteration 2 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 -- Iteration 3 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 
 *** Done ***

diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt
index c41fdf1d7b0ddee0c14afd9a1c33437f1178094d..b39c84b7e0f46aeaa7e5c8a669760aebc1f2f31b 100644 (file)
--- a/ext/standard/tests/file/touch_basic.phpt
+++ b/ext/standard/tests/file/touch_basic.phpt
@@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 echo "*** Testing touch() : basic functionality ***\n";
 
-$filename = dirname(__FILE__)."/touch.dat";
+$filename = dirname(__FILE__)."/touch_basic.dat";
 
 echo "\n--- testing touch creates a file ---\n";
 @unlink($filename);

diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt
index 9ccb90c751ed943082680fba98badbdefb9c9fc0..9477a3494e24380f8bf13443c2b5a07129a012a3 100644 (file)
--- a/ext/standard/tests/file/touch_variation2.phpt
+++ b/ext/standard/tests/file/touch_variation2.phpt
@@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 
 
-$filename = dirname(__FILE__)."/touch.dat";
+$filename = dirname(__FILE__)."/touch_variation2.dat";
 $fp=fopen($filename,"w");
 fwrite ($fp,"mydata");
 fclose($fp);

diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 48aa4be0ba27a1aa153b0b1227c25ddb182be4c1..85353a8242c3091b156ab15ff8adfff452ba8566 100644 (file)
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_003.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';

diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index d4f044e97fc11527c32a41e3b5e0383d458c5bb7..b2d7254fe4f868745ebc0f6320fba10450865b65 100644 (file)
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_004.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';

diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index 842f25e5f61a6c925be23ad99370af5a21d01aab..aacd059b6e454cacf32232de54398e08b0672529 100644 (file)
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -8,7 +8,7 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema
 
 $xmlstring = '<TEI.2>hello</TEI.2>';
 $relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; 
-$file = dirname(__FILE__) . '/__007.xml';
+$file = dirname(__FILE__) . '/_007.xml';
 file_put_contents($file, $xmlstring);
 
 $reader = new XMLReader();

diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index e3af00e4f7f368c73b38ab91cba04919bbd5f57b..2dbb5e7c874ba1663e4faf475eb926ddc63b81a7 100644 (file)
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -23,7 +23,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </LIST>';
 
 $dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; 
-$file = dirname(__FILE__) . '/__008.xml';
+$file = dirname(__FILE__) . '/_008.xml';
 file_put_contents($file, $xmlstring);
 
 

diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index e0edeef2dd5140c7b262376a608ac447c7c77d4b..94fb34038c8d41e0012b2441682faef80fb49c02 100644 (file)
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -38,7 +38,7 @@ $reader->close();
 
 echo "\nUsing URI:\n";
 $reader = new XMLReader();
-$file = dirname(__FILE__) . '/012.xml';
+$file = dirname(__FILE__) . '/_012.xml';
 if (DIRECTORY_SEPARATOR == '\\') {
        $file = str_replace('\\',"/", $file);
 }
@@ -52,7 +52,7 @@ var_dump($reader->getAttribute('baz'));
 $reader->close();
 
 $reader = new XMLReader();
-$reader->open(dirname(__FILE__) . '/012.xml');
+$reader->open(dirname(__FILE__) . '/_012.xml');
 $reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
 while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
 var_dump($reader->getAttribute('bar'));

diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt
index eaca00369bf07b55f4c5d0c141231e15a886a08e..71961a64dc64d1deab2fa44eff306b03441c1af6 100644 (file)
--- a/ext/zlib/tests/bug61139.phpt
+++ b/ext/zlib/tests/bug61139.phpt
@@ -10,5 +10,9 @@ if (!extension_loaded('zlib')) {
 <?php
 
 gzopen('someFile', 'c');
+--CLEAN--
+<?php 
+       unlink('someFile'); 
+?>
 --EXPECTF--
 Warning: gzopen(): gzopen failed in %s on line %d