diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-06-27 15:05:29 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-06-27 15:05:29 +0200 |
| commit | 1ec6ff0b495f31db66cb9b3c225f76579eb48b28 (patch) | |
| tree | 13b6530577e7ac20a2d6e2524cbe73d56b1a2178 | |
| parent | 486d59dcfe8e4fca2dcf66319aec9de1dd8a1211 (diff) | |
| parent | b811bb3920168c19aa7cc9fa51cbad0d3d127dcc (diff) | |
| download | php-git-1ec6ff0b495f31db66cb9b3c225f76579eb48b28.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
added skip condition for powershell requirement of test
| -rw-r--r-- | sapi/cli/tests/cli_process_title_windows.phpt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt index 472f9c10fe..12eb80756d 100644 --- a/sapi/cli/tests/cli_process_title_windows.phpt +++ b/sapi/cli/tests/cli_process_title_windows.phpt @@ -3,7 +3,9 @@ Check cli_process_title support in Windows --SKIPIF-- <?php if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') - die("skip"); + die("skip this test is for Windows platforms only"); +if (shell_exec('PowerShell -Help') === NULL) + die("skip this test requires powershell.exe"); ?> --FILE-- <?php |