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>

diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt
index ed094c6b7a59913c57c93809b34191f811e2541c..4193aeded38c917329ffadf8c3cf132f2766c8c9 100644 (file)
--- 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 9390b3755fc3902df14d565a088abf74029a8ec3..f804891a13c84e0c764e613a1ec96ed3f17ef9d6 100644 (file)
--- 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 ad1677038134bc04aeae862742bbab5479496e05..bfebe425782d447d9cd741b87fe83f9b5ab25da6 100644 (file)
--- 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 088c46d7b6e9e9374e6dfa369a0972d67e0ded2f..a768c2397bfeb50bd679f183a81e98799234d291 100644 (file)
--- 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 f738b9f5be03ee14377a0caa0125cb86999293d7..1d3e506135c207db17be4026ad7062a48418a8a8 100644 (file)
--- 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 45d87d1cbe31979fb0c2721865052913e587eb62..dac275e824fef29a6565a80c23b52d5dfe47cb1f 100644 (file)
--- 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 07f48eb2180e1ab3d152f7bda27b827a239e6b68..f85d55293d49884895128fdf6a1b8f9702804376 100644 (file)
--- 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 d7b093281ea02f1f0d5da7e19f49847d90dffaaa..af023f4b773bef7162c15d449623539aa8907c8e 100644 (file)
--- 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 2c629e18ac08a836e38eb8fec88ebc41161ef1c6..58808e964417137272776f2c83a2f91188d63d68 100644 (file)
--- 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 77a5bf6a08c6a501036ae4261fc2ed373d96e328..12165e44a4b080878c90fa8fc46d088de7519a4f 100644 (file)
--- 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 f88cb70ac6e1b0d860db70d9f497fdc4d2e8599c..5a48457e8f32bcd97964d894da567989170f1036 100644 (file)
--- 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 eca947997869874c2c751ae080f9fdc043b7d901..198121f9b1035354a03266fe1103bbf2766f3ada 100644 (file)
--- 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 910db7b04c080ccbe252ac5d0abf85ff53c508c4..2fb18ee51c90ace99d356083cfbc18a5560fd91a 100644 (file)
--- 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 1688d75a024757f7a7b1beda560dc666f2a6be3d..98c2581fff9694221e9bdcdf829fed3d381d7f91 100644 (file)
--- 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 049800a0aa0b26b2140d1aa5aff4cdfb47ffa6a7..6bda2bc3564e8282f94492ac5e84fb489af22530 100644 (file)
--- 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 7d3290d99e469652731a3832795ef79e252e3daa..28a8c4af2170316cf04421cdb921a90976140140 100644 (file)
--- 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 27ba191d0d52fcfe20df3f1b3f8f8353bad784bb..c27d087bf45e355be1d6cd0a6dfd2655c04f566a 100644 (file)
--- 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 a6baa4b9c1254f5c6562273063515bd3bd6d1028..7c681e2960f356f7b87451ce01f1f93345a9cae2 100644 (file)
--- 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 c46bc486456b0a1def0b767a6eed853058522cc9..baa449439c8abfcfefb19387e213956acbcc6626 100644 (file)
--- 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 c4aa6f831c4d9e897d764453f5495a6255e951ee..2375fb475f261877fa3b1828c92741787bf9a0c1 100644 (file)
--- 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 9265f8ec0bcb9118b89adab4c69e046c0449b59f..7cd13ee394f4b909c2edea302bb7ac5cc49fa39b 100644 (file)
--- 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 71ecc73bc9813d2104dcd9010e6f070d234bd973..6d1fe443583835b725fce93ad6ebb2778ad4f9b6 100644 (file)
--- 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 2ebb63a6882b06110e984ee04ce17efb5dcb98b3..cee6bd0ef9badc78fdbc0b47ac4ad21937b07be7 100644 (file)
--- 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 dc673c260be43c0d1ee856da0af77722ff848202..ec0692a05a8b1febcb6c76b6f245b2776bc00067 100644 (file)
--- 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 eff0c923e809651295317c6c430fff84e71a9669..707128828de7b052e5313dabcbcba32c6e6d55a0 100644 (file)
--- 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 d0e39c0513d0f32dc19edb6c5dff16bcb30eff5c..db011853609458966ed49b8d0d781c06f6ac56ae 100644 (file)
--- 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 c3b3edb7eefdd4ca50cff89e8572350b8d9ce09d..6e77bc8c9a8b44964f0c18f900d79ab04aa94db4 100644 (file)
--- 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 2e97e78460ea94b9f75ebcf5acc4477d79f8464e..fe41cad89ba89c336012f22c486bbed88e4690e9 100644 (file)
--- 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 c6a135f567dab7198da9312be66730c674b9a03d..67eb08b6095001cde1033b9bc75f5530f6d4c47c 100644 (file)
--- 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 07cf3c8e6c9cd7db48b804c8a2027953d6244ced..97956fe872ab5e7cabd8e79389ddc6061ad03290 100644 (file)
--- 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 9f03a9115c597e2955860fea8779c85679a71b94..aa83356c64cd8643206734ee246da852d8b425d9 100644 (file)
--- 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 1ab6f658c04988f1faab6df8689e95063d748ab7..d104e34ceb322195f5f3c7beb1e8ce4e3f155c76 100644 (file)
--- 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 64ad358b5ca83e08152d3f85a5da2adbd8ef8444..bf7bc84d74357c43c5c339b4927a0e0f9677aad3 100644 (file)
--- 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 a178ea574a75da031b05240333f7bafb8e906ba9..2bdfbc60c87a81234fa1ce3e913a62fae807d649 100644 (file)
--- 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 a46a8854ce75350b486d1c7b11a02cd312991d24..fd69312c24729c9bece382b124314f082d4a5bc7 100644 (file)
--- 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 9d92267b019bbd2ffe546c73afe9def03112552f..18a63a32c0d2d06c6d93e39d968f04e8ad20122e 100644 (file)
--- 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 8f79a2982ba65b866c7b43997bb4880a197d67f3..9cda42f686573802fb41134734227eb8499ce007 100644 (file)
--- 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 d924f87edddc4b5239bb1c44ac77c4964977d9e9..22030a24f31d22fdd9206a3fcba0d423e369b53e 100644 (file)
--- 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 da264f9e3ec490f12a45f86544777c373704df4c..3711bd74f91be8459119a45b86012451ce749a63 100644 (file)
--- 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 b79e0f466f553f1b937385a5d9b79630e115f4b9..c3ad1eccc67c7d3bca5e6cd3fef582479a511503 100644 (file)
--- 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 2966eebab42082f2814b278606bb5d4a340890bb..fa8a149f90d28ed30dcb0ad2d03db32c1fa54ead 100644 (file)
--- 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 a8b1a9a67fe9b924f46cad847bc5e71e24647f4e..90d21c5a1528fbb464a741647c62cb688e1bbfc9 100644 (file)
--- 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 a08dfc3e308a815075e3953026b3771a33a5ee7b..60dde8cb7ddd81d13cd61966d61dbcf7cb6b9e2d 100644 (file)
--- 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 db96aa08d67ea4f195bab55a5238dd52c98e5b0d..3c92ff979db546e19b09dce471435adb53a01a44 100644 (file)
--- 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 4da386eaa49cdcc9eda638014c0cd95c7e9efd0c..18ac39a05d0f826b7dc50ae2a437a4daefe9339b 100644 (file)
--- 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 e5b6f4cf778d09f0f35e5781dd24f426c59730fb..781d84589659b7f92bbafba55e7a9e5f325c3730 100644 (file)
--- 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 b8937a2f9e9e01f0c8d2f669133f5b4807de25b9..5ea5915c327a53ec18a4f4139095787d93d4a794 100644 (file)
--- 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 dc4763045065475a04a05f8680f829a0499734ca..ecdfdde3d7981d3f907e05dc2d762395816bb062 100644 (file)
--- 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 109d2dbd649fabc0bd67dadfd98b702536c227fa..6983e732d2ccc72046f4ec09eb7022af2889780a 100644 (file)
--- 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 5ac99b2fd32fb41b3d8e2b721e69e586a51b4228..48bbe7fbfb95c4191e07243e1f0d34851ca839aa 100644 (file)
--- 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 ec95e582d99ca30fe5a63a3b52d28f0dfa5771e5..afda00330ddb00cef2ab1faf34b507c618993b25 100644 (file)
--- 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 fd7303f1e75c7648de87565fad53ddaeae0dfc9c..95fe6c56c73e9942c0077ad49de60a87d24c8342 100644 (file)
--- 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 25e1118fcb5a483078bed93742cc093cef7ee588..b13c54278f960f79425b0e444e32c28a6ad55528 100644 (file)
--- 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 f660c5e9061a67b649820b69e81a4dc2ca55e8da..2200e7d7e86e04a62e9b280af94087abe0e6c2cd 100644 (file)
--- 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 e8a14ca9a403b67c38f4cf032720bab902ef3264..3042cfc02d6ddf323151a604094c8f211e06aeb7 100644 (file)
--- 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 2e6df976a48bed0beb079989bf1e1a22e97b12af..f8c32b58f5f9128806ddf28bec6f9d664965de05 100644 (file)
--- 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 1bc8fca100f24f5f40e7052b874b05178963a121..951f9c065048130be105a72e25e6e24a9cfc1c14 100644 (file)
--- 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 12c38eae69ae881125fb1d150b4e1d027a0f63e1..2c3e74f7aa1a269c4fcf60aa69d286671e175cc3 100644 (file)
--- 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 9163f87b3346460fd3350bae155f53324cdd8570..0cd6474276308735c30768d2241a790123197728 100644 (file)
--- 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 149c0fe595103134120a5d819b27fd152f89e865..0da56cefcc2be693995cd851c3904b100ffef0b8 100644 (file)
--- 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 a6fd814203f90b671392e855cac7681822c40b0b..0c9ad8ee71178482ce806df11e110ce9f1ed1df3 100644 (file)
--- 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 b845e313b3b29460fb49f99bc15bff869bb39d93..1a7e98cbea312d6718a04d7f512b9d6cca270d30 100644 (file)
--- 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 80a49dd28b81cc9a8e6a7abd5084a8664ff8ae4e..a9c22f4db8816649a151c1fba7ad49809c0b3689 100644 (file)
--- 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 1d7764236aaf069baac956d2a85249de0fb9a85c..d42f0095ddf71354d0b8e9d8acc52cec39755411 100644 (file)
--- 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 b29631ad5c8a2d607a787e36dae8e43c2a982304..1c1de16168cdede976965f652a3df57bdfdacba4 100644 (file)
--- 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 d7ee04bf9efcf0c67dcf793372f04caa7db302f3..67d45b9c62ab48227aca2eb74fc509601db88d7f 100644 (file)
--- 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 eef4e4915ea2445052146c7043d9b316f72ee881..bba68d6871adf03ba9671c74c18ada5da995fd0e 100644 (file)
--- 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 52b164fdb2ea61d2ecca0169afcbd2bdd25f430a..2d6aa24f33c46e0cc443a43a8eba9f665aef569d 100644 (file)
--- 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 1a22b13ea6474e29af03eb98d193b7b57ce21b9f..ca731062aa18e584b670399c6cbf9e335ddc9168 100644 (file)
--- 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 b4fe8415c289db487aff6f16635006058bebae95..07ed5e3fb8748947db87c3b73e507d2cf53d9f91 100644 (file)
--- 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 394ab1701139ddedbde8d8617b649498ffaab316..dc61ff26420f135da3fc929cecf176c0e580cf79 100644 (file)
--- 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 0c8f70919f72b88318dfbc25ee24f5558e0697c7..f83bd96a95037091e2ffb5dc6974bb7b96c8732e 100644 (file)
--- 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 634c676385eda864fe0b5124a7b020faa465a254..80b5ebbd070fbd788712c48d1b2e3f989bf17aaa 100644 (file)
--- 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 4b3c63183734bce43643f20422cf5e87c2222af1..a6edffe2f640f873f557dd49cffb5b4a8f0d8696 100644 (file)
--- 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 b1576e827a9fff4050e903802a9f1b2d1962dd11..883d1f9eff34e1052358d405754ae8016597b7c4 100644 (file)
--- 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 73ae71a6bace811baadfcba37e2f3eb7e86cd3b5..5e2bde5cecdc225587c24c4829e82683350d1d2f 100644 (file)
--- 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 8aa7b2378cf6c30a44821e9d1215263a26936ccb..bd493e178f67133ddd899af6e101ac9409098a1d 100644 (file)
--- 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 211124ad217ba67b1caa74e5ee68b365c7eae143..fd98bbcae98feab82fafe177a3c617dbf4cbdc68 100644 (file)
--- 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 d64316b3afbbb1e615fa170685df468b6b366fb7..cbecf279292d31e8672200a830323ed1bc5be6af 100644 (file)
--- 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 acd9323c5cf8a8b2f8d1d2f22a6c1a68ff109a17..6e00d69075f24860a673b0cd9e2c3c029439a35c 100644 (file)
--- 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