diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-04 12:11:44 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-04 12:15:10 +0100 |
| commit | 04c9c4ae7d8a11c132e8275735dcf457709a0cbd (patch) | |
| tree | 72d4fc8d7870979d14762b3f3d1f4e2aa391ee55 /ext/standard | |
| parent | b093bd6ae82e796cdc395238d30afc2721805287 (diff) | |
| download | php-git-04c9c4ae7d8a11c132e8275735dcf457709a0cbd.tar.gz | |
Fix intermittent test failures of windows_mb_path tests
Some of these tests create, use and later remove the same folder, so if
these are run in parallel, they may fail due to race conditions[1]. As
quick fix we add appropriate CONFLICTS clauses to prevent parallel
execution of the respective test groups.
[1] <https://ci.appveyor.com/project/php/php-src/builds/31213037/job/48rp13i0frf5t9hl#L5480>
Diffstat (limited to 'ext/standard')
80 files changed, 160 insertions, 0 deletions
diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index ed094c6b7a..4193aeded3 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts("zip"); ?> +--CONFLICTS-- +bug71509 --FILE-- <?PHP // åöä diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index 9390b3755f..f804891a13 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(950, "ansi"); ?> +--CONFLICTS-- +file_big5 --INI-- defalut_charset=big5 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index ad16770381..bfebe42578 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(950, "ansi"); ?> +--CONFLICTS-- +dir_big5 --INI-- internal_encoding=big5 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 088c46d7b6..a768c2397b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(950, "ansi"); ?> +--CONFLICTS-- +file_big5 --INI-- defalut_charset=cp950 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index f738b9f5be..1d3e506135 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_big5 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index 45d87d1cbe..dac275e824 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_big5 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index 07f48eb218..f85d55293d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_big5 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index d7b093281e..af023f4b77 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index 2c629e18ac..58808e9644 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 77a5bf6a08..12165e44a4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index f88cb70ac6..5a48457e8f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index eca9479978..198121f9b1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 910db7b04c..2fb18ee51c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1250 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 1688d75a02..98c2581fff 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1251, "ansi"); ?> +--CONFLICTS-- +file_cp1251 --INI-- default_charset=cp1251 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index 049800a0aa..6bda2bc356 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1251, "ansi"); ?> +--CONFLICTS-- +dir_cp1251 --INI-- default_charset=cp1251 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 7d3290d99e..28a8c4af21 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1251, "ansi"); ?> +--CONFLICTS-- +file_cp1251 --INI-- internal_encoding=cp1251 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 27ba191d0d..c27d087bf4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index a6baa4b9c1..7c681e2960 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index c46bc48645..baa449439c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index c4aa6f831c..2375fb475f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -12,6 +12,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts("mbstring"); ?> +--CONFLICTS-- +file_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index 9265f8ec0b..7cd13ee394 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -12,6 +12,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts("mbstring"); ?> +--CONFLICTS-- +dir_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index 71ecc73bc9..6d1fe44358 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -12,6 +12,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts("mbstring"); ?> +--CONFLICTS-- +file_cp1251 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 2ebb63a688..cee6bd0ef9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(437, "oem"); ?> +--CONFLICTS-- +file --INI-- internal_encoding=cp1252 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index dc673c260b..ec0692a05a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index eff0c923e8..707128828d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index d0e39c0513..db01185360 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index c3b3edb7ee..6e77bc8c9a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file2_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index 2e97e78460..fe41cad89b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir2_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index c6a135f567..67eb08b609 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir2_cp1252 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 07cf3c8e6c..97956fe872 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1253, "ansi"); ?> +--CONFLICTS-- +file_cp1253 --INI-- internal_encoding=cp1253 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 9f03a9115c..aa83356c64 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1253, "ansi"); ?> +--CONFLICTS-- +dir_cp1253 --INI-- default_charset=cp1253 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 1ab6f658c0..d104e34ceb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1253, "ansi"); ?> +--CONFLICTS-- +dir_cp1253 --INI-- internal_encoding=cp1253 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 64ad358b5c..bf7bc84d74 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1253 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index a178ea574a..2bdfbc60c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1253 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index a46a8854ce..fd69312c24 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1253 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 9d92267b01..18a63a32c0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(857, "oem"); ?> +--CONFLICTS-- +file_cp1254 --INI-- default_charset=cp1254 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 8f79a2982b..9cda42f686 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(857, "oem"); ?> +--CONFLICTS-- +dir_cp1254 --INI-- internal_encoding=cp1254 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index d924f87edd..22030a24f3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(857, "oem"); ?> +--CONFLICTS-- +dir_cp1254 --INI-- internal_encoding=cp1254 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index da264f9e3e..3711bd74f9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1254, "ansi"); ?> +--CONFLICTS-- +file_cp1254 --INI-- default_charset=cp1254 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index b79e0f466f..c3ad1eccc6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1254 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 2966eebab4..fa8a149f90 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1254 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index a8b1a9a67f..90d21c5a15 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1254 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index a08dfc3e30..60dde8cb7d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1254 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index db96aa08d6..3c92ff979d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1255, "ansi"); ?> +--CONFLICTS-- +file_cp1255 --INI-- internal_encoding=cp1255 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 4da386eaa4..18ac39a05d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1255, "ansi"); ?> +--CONFLICTS-- +dir_cp1255 --INI-- default_charset=cp1255 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index e5b6f4cf77..781d845896 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1255, "ansi"); ?> +--CONFLICTS-- +dir_cp1255 --INI-- internal_encoding=cp1255 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index b8937a2f9e..5ea5915c32 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1255 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index dc47630450..ecdfdde3d7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1255 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 109d2dbd64..6983e732d2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1255 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 5ac99b2fd3..48bbe7fbfb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1256, "ansi"); ?> +--CONFLICTS-- +file_cp1256 --INI-- internal_encoding=cp1256 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index ec95e582d9..afda00330d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1256, "ansi"); ?> +--CONFLICTS-- +dir_cp1256 --INI-- internal_encoding=cp1256 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index fd7303f1e7..95fe6c56c7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(1256, "ansi"); ?> +--CONFLICTS-- +dir_cp1256 --INI-- default_charset=cp1256 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index 25e1118fcb..b13c54278f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp1256 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index f660c5e906..2200e7d7e8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1256 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index e8a14ca9a4..3042cfc02d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp1256 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index 2e6df976a4..f8c32b58f5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(874, "ansi"); ?> +--CONFLICTS-- +file_cp874 --INI-- internal_encoding=cp874 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 1bc8fca100..951f9c0650 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp874 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 12c38eae69..2c3e74f7aa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(932, "ansi"); ?> +--CONFLICTS-- +file_cp932 --INI-- default_charset=cp932 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index 9163f87b33..0cd6474276 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(932, "oem"); ?> +--CONFLICTS-- +dir_cp932 --INI-- default_charset=cp932 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index 149c0fe595..0da56cefcc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(932, "oem"); ?> +--CONFLICTS-- +dir_cp932 --INI-- internal_encoding=cp932 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index a6fd814203..0c9ad8ee71 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(932, "ansi"); ?> +--CONFLICTS-- +file_cp932 --INI-- internal_encoding=cp932 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index b845e313b3..1a7e98cbea 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp932 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 80a49dd28b..a9c22f4db8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp932 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index 1d7764236a..d42f0095dd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp932 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index b29631ad5c..1c1de16168 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(936, "ansi"); ?> +--CONFLICTS-- +file_cp936 --INI-- internal_encoding=cp936 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index d7ee04bf9e..67d45b9c62 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(936, "oem"); ?> +--CONFLICTS-- +dir_cp936 --INI-- internal_encoding=cp936 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index eef4e4915e..bba68d6871 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -10,6 +10,8 @@ skip_if_no_required_exts(); skip_if_wrong_cp(936, "oem"); ?> +--CONFLICTS-- +file_cp936 --INI-- default_charset=cp936 --FILE-- diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index 52b164fdb2..2d6aa24f33 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp936 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 1a22b13ea6..ca731062aa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_cp936 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index b4fe8415c2..07ed5e3fb8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_cp936 --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt index 394ab17011..dc61ff2642 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt @@ -12,6 +12,8 @@ skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_mb --FILE-- <?php diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 0c8f70919f..f83bd96a95 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_eucjp --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index 634c676385..80b5ebbd07 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_eucjp --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 4b3c631837..a6edffe2f6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_eucjp --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index b1576e827a..883d1f9eff 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_kartuli --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index 73ae71a6ba..5e2bde5cec 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_kartuli --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index 8aa7b2378c..bd493e178f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +dir_kartuli --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 211124ad21..fd98bbcae9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +file_kartuli --FILE-- <?php /* diff --git a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt index d64316b3af..cbecf27929 100644 --- a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt @@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); skip_if_no_required_exts(); ?> +--CONFLICTS-- +mb_names --FILE-- <?php diff --git a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt index acd9323c5c..6e00d69075 100644 --- a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt @@ -12,6 +12,8 @@ skip_if_no_required_exts(); ?> +--CONFLICTS-- +file2_mb --FILE-- <?php |