From 45589029ed1d4b424aeff60e87c112e586ececc2 Mon Sep 17 00:00:00 2001 From: webchick Date: Mon, 30 Apr 2012 22:06:51 -0700 Subject: Issue #1477110 by msonnabaum, tim.plunkett: Fixed php path detection in run-tests.sh. --- scripts/run-tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/run-tests.sh') diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index cc09c7621..f651f22bb 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -253,14 +253,14 @@ function simpletest_script_init($server_software) { if (!empty($args['php'])) { $php = $args['php']; } - elseif (!empty($_ENV['_'])) { + elseif ($php_env = getenv('_')) { // '_' is an environment variable set by the shell. It contains the command that was executed. - $php = $_ENV['_']; + $php = $php_env; } - elseif (!empty($_ENV['SUDO_COMMAND'])) { + elseif ($sudo = getenv('SUDO_COMMAND')) { // 'SUDO_COMMAND' is an environment variable set by the sudo program. // Extract only the PHP interpreter, not the rest of the command. - list($php, ) = explode(' ', $_ENV['SUDO_COMMAND'], 2); + list($php, ) = explode(' ', $sudo, 2); } else { simpletest_script_print_error('Unable to automatically determine the path to the PHP interpreter. Supply the --php command line argument.'); -- cgit v1.2.3