summaryrefslogtreecommitdiff
path: root/ext/standard/tests/general_functions/proc_nice_basic.phpt
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-08-05 12:12:24 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-08-05 12:12:24 +0200
commit7575340427109fb5dde02cdc2ca83d78a5786426 (patch)
tree69a55509f8f866936b9778a12336613fc38be3f7 /ext/standard/tests/general_functions/proc_nice_basic.phpt
parent879525efa8a9f5c194fca980258d7076173e350b (diff)
parent25bdf9d3e0aa8375443bc0b587fc9d2f48caee59 (diff)
downloadphp-git-7575340427109fb5dde02cdc2ca83d78a5786426.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Check ps -p availability in proc_nice test Set AI_CANONNAME flag in socket_addrinfo test Add ipv6 skipif to test Improve privilege check in pcntl_setpriority() test
Diffstat (limited to 'ext/standard/tests/general_functions/proc_nice_basic.phpt')
-rw-r--r--ext/standard/tests/general_functions/proc_nice_basic.phpt4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt
index 687152ee10..b8cc3cd128 100644
--- a/ext/standard/tests/general_functions/proc_nice_basic.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_basic.phpt
@@ -9,6 +9,10 @@ Simone Gentili (sensorario@gmail.com)
<?php
if(!function_exists('proc_nice')) die("skip. proc_nice not available ");
if(substr(strtoupper(PHP_OS), 0, 3) == 'WIN') die('skip. not for Windows');
+exec('ps -p 1 -o "pid,nice"', $output, $exit_code);
+if ($exit_code !== 0) {
+ die("skip ps -p is not available");
+}
?>
--FILE--
<?php