From: Christoph M. Becker Date: Sun, 5 Jan 2020 18:28:34 +0000 (+0100) Subject: Use IS_WINDOWS X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=718fc4cefde46ace89c2f5a68b6ba5ecab8c26cb;p=php Use IS_WINDOWS --- diff --git a/run-tests.php b/run-tests.php index 1a1d2e9c53..21677fa2da 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2109,11 +2109,7 @@ TEST $file if (array_key_exists('INI', $section_text)) { $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']); - if (PHP_OS_FAMILY === 'Windows') { - $replacement = '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"'; - } else { - $replacement = 'tee $1 >/dev/null'; - } + $replacement = IS_WINDOWS ? '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"' : 'tee $1 >/dev/null'; $section_text['INI'] = preg_replace('/{MAIL:(\S+)}/', $replacement, $section_text['INI']); settings2array(preg_split("/[\n\r]+/", $section_text['INI']), $ini_settings); }