Commit 45589029 authored by webchick's avatar webchick

Issue #1477110 by msonnabaum, tim.plunkett: Fixed php path detection in run-tests.sh.

parent 1ef0cd4e
......@@ -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.');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment