From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 22 Feb 2019 10:11:20 +0000 (+0100)
Subject: Fix directory collisions in zlib tests
X-Git-Tag: php-7.4.0alpha1~907
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c9fe3042560b63b35daefbe57306c4164a672af;p=php

Fix directory collisions in zlib tests
---

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);