From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 9 Jul 2020 10:36:57 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e33dd6ab1f039cca0de3c1ebc106f4bce77e959f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflicts
---

e33dd6ab1f039cca0de3c1ebc106f4bce77e959f
diff --cc ext/standard/tests/file/unlink_error-win32-mb.phpt
index b904ef4533,54a433b861..e85db00600
--- a/ext/standard/tests/file/unlink_error-win32-mb.phpt
+++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@@ -8,8 -8,11 +8,8 @@@ if (substr(PHP_OS, 0, 3) != 'WIN') 
  ?>
  --FILE--
  <?php
 -/* Prototype : bool unlink ( string $filename [, resource $context] );
 -   Description : Deletes filename
 -*/
  
- $file_path = __DIR__.DIRECTORY_SEPARATOR."私はガラスを食べられます";
+ $file_path = __DIR__.DIRECTORY_SEPARATOR."unlinkErr私はガラスを食べられます";
  
  @mkdir($file_path);