diff options
author | Anatol Belski <ab@php.net> | 2017-09-18 12:06:54 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-09-18 12:06:54 +0200 |
commit | d8f1afb45ea90cd655e62b4f514276099a033521 (patch) | |
tree | 41455e5a8a3976fe6fd1f8b231407110863048de /sapi | |
parent | 41e5f916bffaf59b3a2374511e45cb7a22bb2665 (diff) | |
parent | 5c59dd0047b9c99d7179a1107adc71f5a7daea44 (diff) | |
download | php-git-d8f1afb45ea90cd655e62b4f514276099a033521.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix the version check causing the test fail
Diffstat (limited to 'sapi')
-rw-r--r-- | sapi/cli/tests/cli_process_title_windows.phpt | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt index 4e81b4c634..91bac579e8 100644 --- a/sapi/cli/tests/cli_process_title_windows.phpt +++ b/sapi/cli/tests/cli_process_title_windows.phpt @@ -20,19 +20,7 @@ if (shell_exec('PowerShell -Help') === NULL) // Hence on Windows 8, we don't verify that the title is actually set by // cli_set_process_title(). We're only making the API calls to ensure there are // no warnings/errors. - -$is_windows8_or_above = false; -$ps_output = shell_exec("PowerShell -NoProfile \"(Get-Host).UI.RawUI.WindowTitle\""); -if ($ps_output === null) -{ - echo "Get-Host failed\n"; - die(); -} - -$ps_output = trim($ps_output); -$end_title_windows8 = ": Windows PowerShell"; -if (($ps_output == "Windows PowerShell") || (strlen($ps_output) > strlen($end_title_windows8) && substr($ps_output,-strlen($end_title_windows8)) === $end_title_windows8) || PHP_WINDOWS_VERSION_MAJOR >= 10) - $is_windows8_or_above = true; +$is_windows8_or_above = PHP_WINDOWS_VERSION_MAJOR >= 10 || PHP_WINDOWS_VERSION_MAJOR >= 6 && PHP_WINDOWS_VERSION_MINOR >= 2; echo "*** Testing setting the process title ***\n"; |