diff options
| author | Anatol Belski <ab@php.net> | 2016-01-18 17:02:58 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-18 17:02:58 +0100 |
| commit | 5af056a662f779fd271db15a841fbfedf16217bc (patch) | |
| tree | e2d14f4fee56e66e0b0db0cd4b3498380725c514 /sapi/cli | |
| parent | e1540044e90a08d0edc57352616a8ad61296e3b9 (diff) | |
| parent | 71dbad172fad8612046dadbfd0536c759559e40d (diff) | |
| download | php-git-5af056a662f779fd271db15a841fbfedf16217bc.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fork test
fix test
fork test
fork test for win32
fork test
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/tests/cli_process_title_windows.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt index 12eb80756d..4e81b4c634 100644 --- a/sapi/cli/tests/cli_process_title_windows.phpt +++ b/sapi/cli/tests/cli_process_title_windows.phpt @@ -21,7 +21,7 @@ if (shell_exec('PowerShell -Help') === NULL) // cli_set_process_title(). We're only making the API calls to ensure there are // no warnings/errors. -$is_windows8 = false; +$is_windows8_or_above = false; $ps_output = shell_exec("PowerShell -NoProfile \"(Get-Host).UI.RawUI.WindowTitle\""); if ($ps_output === null) { @@ -31,8 +31,8 @@ if ($ps_output === null) $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)) - $is_windows8 = true; +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; echo "*** Testing setting the process title ***\n"; @@ -42,7 +42,7 @@ $pid = getmypid(); if (cli_set_process_title($original_title) === true) echo "Successfully set title\n"; -if ($is_windows8) +if ($is_windows8_or_above) { $loaded_title = $original_title; } @@ -82,4 +82,4 @@ else *** Testing setting the process title *** Successfully set title Successfully verified title using get-process -Successfully verified title using get
\ No newline at end of file +Successfully verified title using get |