diff options
| author | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-01 12:24:38 +0100 |
|---|---|---|
| committer | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-01 12:24:38 +0100 |
| commit | 5367f36da76fa23589336ed62ca38f4a7208af6e (patch) | |
| tree | b707fdc6d3688b7181d1de37be23ab4d65268581 | |
| parent | db14b78099ba02fe810732ce6ae2666fb0d7285e (diff) | |
| download | php-git-5367f36da76fa23589336ed62ca38f4a7208af6e.tar.gz | |
Fix conflicts between tests with obscure filenames
| -rw-r--r-- | ext/standard/tests/file/file_get_contents_variation8-win32.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/file_put_contents_variation8-win32.phpt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index 4928404098..e8d6238715 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { die("skip Valid only on 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-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 095980b536..c21c2da986 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only run on Windows"); ?> +--CONFLICTS-- +obscure_filename --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) |