com php-src: Fix #72676: Test cli_process_title_unix fa ils on AIX: sapi/cli/tests/cli_process_title_unix .phpt

From: Date: Thu, 28 Jul 2016 14:51:45 +0000
Subject: com php-src: Fix #72676: Test cli_process_title_unix fa ils on AIX: sapi/cli/tests/cli_process_title_unix .phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93455@lists.php.net to get a copy of this message
Commit: 6e886f07a8f8cdad8ffb056d6133b49a79a0d216 Author: Christoph M. Becker <cmb@php.net> Thu, 28 Jul 2016 16:49:45 +0200 Parents: ee6900c3de68f1b94dfae8e230c7fa755c7fa595 Branches: PHP-5.6 PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e886f07a8f8cdad8ffb056d6133b49a79a0d216 Log: Fix #72676: Test cli_process_title_unix fails on AIX Patch provided by matthieu dot sarter dot external at atos dot net. Bugs: https://bugs.php.net/72676 Changed paths: M sapi/cli/tests/cli_process_title_unix.phpt Diff: diff --git a/sapi/cli/tests/cli_process_title_unix.phpt b/sapi/cli/tests/cli_process_title_unix.phpt index c263270..659299c 100644 --- a/sapi/cli/tests/cli_process_title_unix.phpt +++ b/sapi/cli/tests/cli_process_title_unix.phpt @@ -15,7 +15,12 @@ $pid = getmypid(); if (cli_set_process_title($original_title) === true) echo "Successfully set title\n"; -$ps_output = shell_exec("ps -p $pid -o command | tail -n 1"); +$ps_process_title_field = "command"; +if (strtoupper(substr(PHP_OS, 0, 3)) == "AIX") +{ + $ps_process_title_field = "args"; +} +$ps_output = shell_exec("ps -p $pid -o $ps_process_title_field | tail -n 1"); if ($ps_output === null) {

« previous php.cvs (#93455) next »