diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-10-29 03:00:38 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-10-29 03:00:38 +0000 |
commit | 90ca93c9bcfc40e7c8817f34f11c8eebe7a9aecb (patch) | |
tree | f6bc429bb515a9090cbdee43d26c2203ce49f7b2 /scripts/run-tests.sh | |
parent | 665486100303d8b6f4a720b1f865555e148f6ce3 (diff) | |
download | brdo-90ca93c9bcfc40e7c8817f34f11c8eebe7a9aecb.tar.gz brdo-90ca93c9bcfc40e7c8817f34f11c8eebe7a9aecb.tar.bz2 |
- Patch #322843 by Damien Tournoud: fixed --php option.
Diffstat (limited to 'scripts/run-tests.sh')
-rwxr-xr-x | scripts/run-tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index 572bd6885..2cb63310a 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -229,14 +229,14 @@ function simpletest_script_init() { $host = 'localhost'; $path = ''; // Determine location of php command automatically, unless a comamnd line argument is supplied. - if (isset($args['php'])) { + if (!empty($args['php'])) { $php = $args['php']; } - elseif (isset($_ENV['_'])) { + elseif (!empty($_ENV['_'])) { // '_' is an environment variable set by the shell. It contains the command that was executed. $php = $_ENV['_']; } - elseif (isset($_ENV['SUDO_COMMAND'])) { + elseif (!empty($_ENV['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); |