diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-14 10:25:02 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-14 10:25:02 +0200 |
| commit | 1a98878bfe5c8907429c1f7fa3505d5eec45189b (patch) | |
| tree | b517c499505c820cd9b52cf4f45e498bd7d94a82 | |
| parent | aa74c3046674d7373048f609fdc12dae71351b1b (diff) | |
| parent | 704a0ab0c9c0dd2e2b2041f3934df61d7b588cc9 (diff) | |
| download | php-git-1a98878bfe5c8907429c1f7fa3505d5eec45189b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case
| -rw-r--r-- | Zend/tests/bug55509.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/bug55509.phpt b/Zend/tests/bug55509.phpt index efcf918775..ff42ebca95 100644 --- a/Zend/tests/bug55509.phpt +++ b/Zend/tests/bug55509.phpt @@ -46,7 +46,7 @@ elseif (PHP_OS == 'FreeBSD') { die('skip Not enough memory.'); } } elseif (PHP_OS == "WINNT") { - $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nil")); + $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nul")); $freeMemory = explode('=', $s)[1]*1; if ($freeMemory < 2.1*1024*1024) { |