summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-22 11:11:20 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-22 11:25:52 +0100
commit1c9fe3042560b63b35daefbe57306c4164a672af (patch)
tree9f5c7e3c30f31d8ccd3e16e0f27ead0d4ebc8cc8
parente2cc0b823cbeb57ded6366a5710b359088e6e1d6 (diff)
downloadphp-git-1c9fe3042560b63b35daefbe57306c4164a672af.tar.gz
Fix directory collisions in zlib tests
-rw-r--r--ext/zlib/tests/gzfile_variation15.phpt1
-rw-r--r--ext/zlib/tests/gzopen_variation4.phpt1
-rw-r--r--ext/zlib/tests/readgzfile_variation15.phpt1
-rw-r--r--ext/zlib/tests/reading_include_path.inc1
4 files changed, 3 insertions, 1 deletions
diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 02eb2df81f..153f56715b 100644
--- 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 a00fd878fe..baa9c715ae 100644
--- 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 5a97949050..40773f7bf0 100644
--- 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 abe80bf69c..b4dbbc2804 100644
--- 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);