Fix directory collisions in zlib tests

diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 02eb2df81ffa3c1d7897c2f7fbf2b9b33d37b552..153f56715bc5783877e10999818451e7336ed955 100644 (file)
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -8,6 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
+$thisTestDir = 'gzfile_variation15.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index a00fd878fe164f952a08db039773e4f99ba7dc76..baa9c715aeb544eebf4ffe01b006dc21dc793a7b 100644 (file)
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -16,6 +16,7 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzopen() : usage variation ***\n";
 
+$thisTestDir = 'gzopen_variation4.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt
index 5a97949050677c8901537786d2f25aa37a581e2e..40773f7bf012c4f7168cebe7f9cae830d93f8271 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -8,6 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
+$thisTestDir = 'readgzfile_variation15.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

diff --git a/ext/zlib/tests/reading_include_path.inc b/ext/zlib/tests/reading_include_path.inc
index abe80bf69c1767462e71561586c6746d46429629..b4dbbc280464af8e2768d75b673c7e8690e30c2c 100644 (file)
--- a/ext/zlib/tests/reading_include_path.inc
+++ b/ext/zlib/tests/reading_include_path.inc
@@ -1,5 +1,4 @@
 <?php
-$thisTestDir = "zlibVariation.dir";
 mkdir($thisTestDir);
 chdir($thisTestDir);