diff options
| author | Remi Collet <remi@php.net> | 2019-06-20 11:59:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-06-20 11:59:21 +0200 |
| commit | 50978128f50eb5fa5920aea8a19a5855059a87c7 (patch) | |
| tree | a78d28bbdb7bcbf5c333390e032272d25ab6efa1 | |
| parent | 714cd7ff3e24e3ce38e6c6fbd56e95241698df59 (diff) | |
| parent | 961935fde224f4488d3335bf8f509fb679e06e58 (diff) | |
| download | php-git-50978128f50eb5fa5920aea8a19a5855059a87c7.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
fix test for Windows and for parallel run
| -rw-r--r-- | ext/opcache/tests/bug78185.phpt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext/opcache/tests/bug78185.phpt b/ext/opcache/tests/bug78185.phpt index 4be8431641..1723a16474 100644 --- a/ext/opcache/tests/bug78185.phpt +++ b/ext/opcache/tests/bug78185.phpt @@ -7,13 +7,23 @@ opcache.file_cache={PWD} opcache.file_cache_only=1 --FILE-- <?php -foreach (glob(__DIR__ . '/*/' . __DIR__ . '/*.bin') as $p) { +if (substr(PHP_OS, 0, 3) !== 'WIN') { + $pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin'; +} else { + $pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin'; +} +foreach (glob($pattern) as $p) { var_dump($p); } ?> --CLEAN-- <?php -foreach (glob(__DIR__ . '/*/' . __DIR__ . '/*.bin') as $p) { +if (substr(PHP_OS, 0, 3) !== 'WIN') { + $pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin'; +} else { + $pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin'; +} +foreach (glob($pattern) as $p) { unlink($p); $p = dirname($p); while(strlen($p) > strlen(__DIR__)) { |