summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-07-09 12:35:31 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-07-09 12:35:31 +0200
commitdb484b612dc5810466400af08762621bbd8abc5e (patch)
tree2dfe290afe6d92cb1db1a413f305944742f102e3
parent8318379dd36c0cac601e8f95697da01b6f7706ad (diff)
downloadphp-git-db484b612dc5810466400af08762621bbd8abc5e.tar.gz
Prevent parallel test conflicts
Both tests used the same folder, which could clash in case the tests are run simultaneously.
-rw-r--r--ext/standard/tests/file/unlink_error-win32-mb.phpt8
-rw-r--r--ext/standard/tests/file/unlink_variation1-win32-mb.phpt2
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 a208e5675b..54a433b861 100644
--- a/ext/standard/tests/file/unlink_error-win32-mb.phpt
+++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
Description : Deletes filename
*/
-$file_path = __DIR__.DIRECTORY_SEPARATOR."私はガラスを食べられます";
+$file_path = __DIR__.DIRECTORY_SEPARATOR."unlinkErr私はガラスを食べられます";
@mkdir($file_path);
@@ -62,9 +62,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 e18049fdbe..65d70bd67d 100644
--- a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt
@@ -17,7 +17,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