diff options
| author | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-01 12:33:36 +0100 |
|---|---|---|
| committer | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-01 12:33:36 +0100 |
| commit | a0d58abb79b5f2c91e30a5ae6a0e835ed3ed3026 (patch) | |
| tree | 35a4c870c4cdfbca979434785a84447725080ec5 /ext/standard/tests/file | |
| parent | 5367f36da76fa23589336ed62ca38f4a7208af6e (diff) | |
| download | php-git-a0d58abb79b5f2c91e30a5ae6a0e835ed3ed3026.tar.gz | |
Fix conflicts between tests with obscure filenames
For non-windows tests
Diffstat (limited to 'ext/standard/tests/file')
| -rw-r--r-- | ext/standard/tests/file/file_get_contents_variation8.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/file_put_contents_variation8.phpt | bin | 2473 -> 2504 bytes |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 97a3495d54..06fd1b3a5f 100644 --- 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 Binary files differindex f0161dca57..497c68b2bb 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt |