Merge branch 'PHP-5.5'

* PHP-5.5:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
This commit is contained in:
Stanislav Malyshev 2013-08-18 14:11:15 -07:00
commit 958ee39fc7

View File

@ -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>.