diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-20 08:57:43 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-20 08:57:43 +0100 |
| commit | 825384c478a47fda8c3f26652aed1a9f7fc1ac84 (patch) | |
| tree | 75239b7d2bc0ff818cc6b4e0a64f1955f75e8f41 | |
| parent | ccc49ead681add7bdf6a021c7a3420aff543bc1e (diff) | |
| parent | 9e6d80dc8fa13e00bfcc4a6897a3fd796f3b5e01 (diff) | |
| download | php-git-825384c478a47fda8c3f26652aed1a9f7fc1ac84.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix potential test conflict
| -rw-r--r-- | ext/standard/tests/file/windows_mb_path/bug54028_2.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt index d6ef5925a8..af27036701 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt @@ -16,7 +16,7 @@ skip_if_no_required_exts(); include __DIR__ . DIRECTORY_SEPARATOR . "util.inc"; -$prefix = __DIR__ . DIRECTORY_SEPARATOR . "testBug54028" . DIRECTORY_SEPARATOR; +$prefix = __DIR__ . DIRECTORY_SEPARATOR . "testBug54028_2" . DIRECTORY_SEPARATOR; $dirs = array("a", "ソ", "ゾ", "şŞıİğĞ", "多国語", "王", "汚れて掘る"); |