Fix conflicts between tests with obscure filenames

For non-windows tests

diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index 97a3495d5439b188bdf06ecb370bdc00261d6eda..06fd1b3a5feeeb6cd3df4038e7ffd5856d17e459 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8.phpt
@@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])

diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index f0161dca5745062a41e7664fc9cccaac100cd2f3..497c68b2bb759b18270c036d78419e6986d6febc 100644 (file)
Binary files a/ext/standard/tests/file/file_put_contents_variation8.phpt and b/ext/standard/tests/file/file_put_contents_variation8.phpt differ