From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 9 Feb 2019 23:43:28 +0000 (+0100)
Subject: Fix failing tests
X-Git-Tag: php-7.4.0alpha1~1100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=650a217b0ca609119ba8f6dae501c3e8eae8bd35;p=php

Fix failing tests

The run-tests script executes the cleaning section separately and interfers
with the running test itself less. This fixes two failing tests on Windows
platforms.
---

diff --git a/ext/zip/tests/oo_unchangeIndex.phpt b/ext/zip/tests/oo_unchangeIndex.phpt
index eabb53c70b..f4b5a9a82a 100644
--- a/ext/zip/tests/oo_unchangeIndex.phpt
+++ b/ext/zip/tests/oo_unchangeIndex.phpt
@@ -29,8 +29,10 @@ var_dump($zip->getNameIndex(0));
 var_dump($zip->getCommentIndex(0));
 
 var_dump(md5_file($file));
-
-unlink($file);
+?>
+--CLEAN--
+<?php
+unlink(__DIR__.'/__tmp_oo_unchangeIndex.zip');
 ?>
 --EXPECT--
 string(32) "cb753d0a812b2edb386bdcbc4cd7d131"
diff --git a/ext/zip/tests/oo_unchangeName.phpt b/ext/zip/tests/oo_unchangeName.phpt
index 3e16980685..23dd0574af 100644
--- a/ext/zip/tests/oo_unchangeName.phpt
+++ b/ext/zip/tests/oo_unchangeName.phpt
@@ -29,8 +29,10 @@ var_dump($zip->getNameIndex(0));
 var_dump($zip->getCommentIndex(0));
 
 var_dump(md5_file($file));
-
-unlink($file);
+?>
+--CLEAN--
+<?php
+unlink(__DIR__.'/__tmp_oo_unchangeIndex.zip');
 ?>
 --EXPECT--
 string(32) "cb753d0a812b2edb386bdcbc4cd7d131"