diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-18 14:09:19 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-18 14:09:19 -0700 |
| commit | 2ee7e122a7aa03aaadb38ebccb9b5c2b07b2a1b3 (patch) | |
| tree | 038d1243dde2dabd2f07f0431d59d79c82b95fb1 /run-tests.php | |
| parent | 296a434d528b1c4c61e11b93890e605d0793612c (diff) | |
| parent | 3da2fb335db1f8ed64967164e090688ba0eb793d (diff) | |
| download | php-git-2ee7e122a7aa03aaadb38ebccb9b5c2b07b2a1b3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add -P option to use the current binary
Create test to the extension xmlrpc
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php index 8c8df610b8..54a12a177d 100755 --- a/run-tests.php +++ b/run-tests.php @@ -601,6 +601,15 @@ if (isset($argc) && $argc > 1) { putenv("TEST_PHP_EXECUTABLE=$php"); $environment['TEST_PHP_EXECUTABLE'] = $php; break; + case 'P': + if(constant('PHP_BINARY')) { + $php = PHP_BINARY; + } else { + break; + } + putenv("TEST_PHP_EXECUTABLE=$php"); + $environment['TEST_PHP_EXECUTABLE'] = $php; + break; case 'q': putenv('NO_INTERACTION=1'); break; @@ -690,6 +699,8 @@ Options: -p <php> Specify PHP executable to run. + -P Use PHP_BINARY as PHP executable to run. + -q Quiet, no user interaction (same as environment NO_INTERACTION). -s <file> Write output to <file>. |