From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 16 Jun 2019 09:48:48 +0000 (+0200)
Subject: Prevent parallel test conflict
X-Git-Tag: php-7.4.0alpha2~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c3215251565166c7d64a84384be75046c19ad8;p=php

Prevent parallel test conflict

Cf. <https://travis-ci.org/php/php-src/jobs/546112543#L2865-L2866>.
---

diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
index bd58f93cf7..585b8f87fb 100644
--- a/ext/standard/tests/file/unlink_variation10.phpt
+++ b/ext/standard/tests/file/unlink_variation10.phpt
@@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 echo "*** Testing unlink() : variation ***\n";
 
-$workDir = "unlinkVar8.tmp";
+$workDir = "unlinkVar10.tmp";
 $tmpDir = "subDir.tmp";
 $dirToLinkTo = $workDir.'/'."linkme.tmp";
 
@@ -83,24 +83,24 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) {
 ===DONE===
 --EXPECTF--
 *** Testing unlink() : variation ***
--- unlinking soft link unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link ./unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link ./unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link unlinkVar8.tmp/../unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link /%s/unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link /%s/unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link /%s/./unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link /%s/./unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link /%s/unlinkVar8.tmp/../unlinkVar8.tmp/subDir.tmp --
+-- unlinking soft link /%s/unlinkVar10.tmp/../unlinkVar10.tmp/subDir.tmp --
 directory unlinked
--- unlinking soft link unlinkVar8.tmp//subDir.tmp --
+-- unlinking soft link unlinkVar10.tmp//subDir.tmp --
 directory unlinked
--- unlinking soft link /%s//unlinkVar8.tmp//subDir.tmp --
+-- unlinking soft link /%s//unlinkVar10.tmp//subDir.tmp --
 directory unlinked
 
 --- try to unlink a directory ---
 
-Warning: unlink(unlinkVar8.tmp/linkme.tmp): %s in %s on line %d
+Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d
 ===DONE===