projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
precise comes with libcurl4
[m6w6/ext-http]
/
tests
/
helper
/
server.inc
diff --git
a/tests/helper/server.inc
b/tests/helper/server.inc
index aa8559f8c41fbb3480f1e6dbcf6a02de0a3659b6..506e08313b2c70f71a97f494bb5097171bc7a1f0 100644
(file)
--- a/
tests/helper/server.inc
+++ b/
tests/helper/server.inc
@@
-1,12
+1,21
@@
-<?php
+<?php
-// PHP-5.3
-if (!defined("PHP_BINARY")) {
- define("PHP_BINARY", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
+$php = getenv('TEST_PHP_EXECUTABLE');
+if ($php) {
+ define('PHP_BIN', $php);
+} else if (defined('PHP_BINARY')) {
+ define('PHP_BIN', PHP_BINARY);
+} else {
+ // PHP-5.3
+ define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
}
function serve($cb) {
}
function serve($cb) {
- foreach (range(8000, 9000) as $port) {
+ /* stream_socket_server() automatically sets SO_REUSEADDR,
+ * which is, well, bad if the tests are run in parallel
+ */
+ $offset = rand(0,2000);
+ foreach (range(8000+$offset, 9000+$offset) as $port) {
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
do {
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
do {
@@
-35,12
+44,18
@@
function serve($cb) {
}
function server($handler, $cb) {
}
function server($handler, $cb) {
- proc(PHP_BINARY, array(__DIR__."/$handler"), $cb);
+ $args = explode(' ', getenv('TEST_PHP_ARGS'));
+ $args[] = __DIR__."/$handler";
+ foreach ($args as $k => $v) {
+ if (!$v) unset($args[$k]);
+ }
+ proc(PHP_BIN, $args, $cb);
}
function nghttpd($cb) {
$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
}
function nghttpd($cb) {
$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
- foreach (range(8000, 9000) as $port) {
+ $offset = rand(0,2000);
+ foreach (range(8000+$offset, 9000+$offset) as $port) {
$comm = "exec nghttpd -d html $port http2.key http2.crt";
if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
$stdin = $pipes[0];
$comm = "exec nghttpd -d html $port http2.key http2.crt";
if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
$stdin = $pipes[0];
@@
-77,7
+92,7
@@
function proc($bin, $args, $cb) {
$stdin = $pipes[0];
$stdout = $pipes[1];
$stderr = $pipes[2];
$stdin = $pipes[0];
$stdout = $pipes[1];
$stderr = $pipes[2];
-
+
do {
$port = trim(fgets($stderr));
$R = array($stderr); $W = array(); $E = array();
do {
$port = trim(fgets($stderr));
$R = array($stderr); $W = array(); $E = array();