diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-09 12:36:57 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-09 12:36:57 +0200 |
| commit | e33dd6ab1f039cca0de3c1ebc106f4bce77e959f (patch) | |
| tree | 7055d88f21ea0259fc768acd9cfb437d1661a798 /ext | |
| parent | 613a56d1cbac89a5bba456b3fae7174284260d8a (diff) | |
| parent | db484b612dc5810466400af08762621bbd8abc5e (diff) | |
| download | php-git-e33dd6ab1f039cca0de3c1ebc106f4bce77e959f.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflicts
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/tests/file/unlink_error-win32-mb.phpt | 8 | ||||
| -rw-r--r-- | ext/standard/tests/file/unlink_variation1-win32-mb.phpt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt index b904ef4533..e85db00600 100644 --- a/ext/standard/tests/file/unlink_error-win32-mb.phpt +++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php -$file_path = __DIR__.DIRECTORY_SEPARATOR."私はガラスを食べられます"; +$file_path = __DIR__.DIRECTORY_SEPARATOR."unlinkErr私はガラスを食べられます"; @mkdir($file_path); @@ -49,9 +49,9 @@ echo "Done\n"; ?> --CLEAN-- <?php -unlink(__DIR__."/私はガラスを食べられます/unlink_error.tmp"); -rmdir(__DIR__."/私はガラスを食べられます/unlink_error"); -rmdir(__DIR__."/私はガラスを食べられます"); +unlink(__DIR__."/unlinkErr私はガラスを食べられます/unlink_error.tmp"); +rmdir(__DIR__."/unlinkErr私はガラスを食べられます/unlink_error"); +rmdir(__DIR__."/unlinkErr私はガラスを食べられます"); ?> --EXPECTF-- *** Testing unlink() : error conditions *** diff --git a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt index e1bb075d2b..8d2a80726a 100644 --- a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { */ -$file_path = __DIR__.DIRECTORY_SEPARATOR."私はガラスを食べられます"; +$file_path = __DIR__.DIRECTORY_SEPARATOR."unlinkVar1私はガラスを食べられます"; @mkdir($file_path); // temp dir name used here |