From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 10 Apr 2019 11:39:17 +0000 (+0200)
Subject: Make zlib include_path tests more robust
X-Git-Tag: php-7.4.0alpha1~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=397ee767fd87f240683fead2a768179624ee25f0;p=php

Make zlib include_path tests more robust

One file is placed inside the script directory, we need to make
sure it has a unique name as well.
---

diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 153f56715b..866348efa0 100644
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-$thisTestDir = 'gzfile_variation15.dir';
+$testName = 'gzfile_variation15';
 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 baa9c715ae..1648b75fb9 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -16,7 +16,7 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzopen() : usage variation ***\n";
 
-$thisTestDir = 'gzopen_variation4.dir';
+$testName = 'gzopen_variation4';
 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 40773f7bf0..48115c7fdb 100644
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-$thisTestDir = 'readgzfile_variation15.dir';
+$testName = 'readgzfile_variation15';
 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 b4dbbc2804..99ac44503a 100644
--- a/ext/zlib/tests/reading_include_path.inc
+++ b/ext/zlib/tests/reading_include_path.inc
@@ -1,10 +1,11 @@
 <?php
+$thisTestDir = $testName . '.dir';
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
 //create the include directory structure
 $workingDir = "workdir";
-$filename = "afile.txt.gz";
+$filename = $testName . ".txt.gz";
 $scriptDir = dirname(__FILE__);
 $baseDir = getcwd();
 $secondFile = $baseDir."/dir2/".$filename;