X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fhelper%2Fserver.inc;h=e3b7af6a956f4b3b58a5b2a159e0396008c0f977;hp=aa8559f8c41fbb3480f1e6dbcf6a02de0a3659b6;hb=762ce165685c677e780b87668658c939bd88c709;hpb=e867316f1364f589eec67cc684703c874984430b

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index aa8559f..e3b7af6 100644
--- 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) {
-	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 {
@@ -35,12 +44,17 @@ function serve($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"));
-	foreach (range(8000, 9000) as $port) {
+	foreach (range(8000+PHP_INT_SIZE, 9000) as $port) {
 		$comm = "exec nghttpd -d html $port http2.key http2.crt";
 		if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
 			$stdin = $pipes[0];
@@ -77,7 +91,7 @@ function proc($bin, $args, $cb) {
 		$stdin = $pipes[0];
 		$stdout = $pipes[1];
 		$stderr = $pipes[2];
-		
+
 		do {
 			$port = trim(fgets($stderr));
 			$R = array($stderr); $W = array(); $E = array();