summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-09-18 12:04:31 +0200
committerAnatol Belski <ab@php.net>2017-09-18 12:04:31 +0200
commit9641586efa861abc1f6b1dba9efba73a065e3ca5 (patch)
treec8cff1929cfd468f23108efce0d752485d6e5db4
parent7670590efdd2dfa63599873196ed7c8abeafd040 (diff)
downloadphp-git-9641586efa861abc1f6b1dba9efba73a065e3ca5.tar.gz
Fix the version check causing the test fail
-rw-r--r--sapi/cli/tests/cli_process_title_windows.phpt14
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";