diff options
| author | Anatol Belski <ab@php.net> | 2016-06-22 12:22:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-22 12:22:03 +0200 |
| commit | c196f9cdf73f49a73eb35919525cfc4b218174bc (patch) | |
| tree | 38fdaa50a7ca118b16dc64343a8cd0e86eaa9112 | |
| parent | 98f6248dcfe587c22da253bd2c43c54a047b5d95 (diff) | |
| parent | 4638ba9c076713c7a7f0dc2779e42bb87dce499d (diff) | |
| download | php-git-c196f9cdf73f49a73eb35919525cfc4b218174bc.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test cleanup
| -rw-r--r-- | ext/standard/tests/file/bug65701.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/file/bug65701.phpt b/ext/standard/tests/file/bug65701.phpt index 42d8d3e628..98c3d3d381 100644 --- a/ext/standard/tests/file/bug65701.phpt +++ b/ext/standard/tests/file/bug65701.phpt @@ -22,7 +22,7 @@ var_dump(filesize($dst)); <?php $file_path = dirname(__FILE__) . "/bug65701/"; foreach (scandir($file_path) as $file) { - if (strpos($file, "bug65701") !== false) { + if (strpos($file, "bug65701") !== false || 'WIN' == substr(PHP_OS, 0, 3)) { unlink($file_path . $file); } } |