diff options
| author | Anatol Belski <ab@php.net> | 2016-01-18 17:02:23 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-18 17:02:23 +0100 |
| commit | 71dbad172fad8612046dadbfd0536c759559e40d (patch) | |
| tree | 32bd00b3cce681a507ecbea15a7132cf4102b7b6 /sapi/cli | |
| parent | d7fc3be99ea2df4405845a16d6cd5c80d9a4f79f (diff) | |
| parent | fa0dd6006d7ea2ac2b8e0d8e9caa82b11d4f9fe1 (diff) | |
| download | php-git-71dbad172fad8612046dadbfd0536c759559e40d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
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 |