summaryrefslogtreecommitdiffstats
path: root/16.patch
blob: a122569f6e919f191cfadd8e1f9155721e8e0805 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
From 17dee351417758f8d30c49e26e3212e888100c4e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 1 Dec 2022 15:21:51 +0100
Subject: [PATCH] Use TEST_PHP_ARGS (from run-tests.php) instead of trying to
 build it

---
 tests/server_test.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/server_test.inc b/tests/server_test.inc
index a47c45c..1738f2a 100644
--- a/tests/server_test.inc
+++ b/tests/server_test.inc
@@ -32,7 +32,7 @@ function server_start_one($host, $port, $code = 'echo "Hello world";', $php_opts
 	} else {
 		$php_args = "-d extension_dir=$doc_root/../modules";
 	}
-	$php_args = "$php_args -d extension=$ext";
+	$php_args = (getenv('TEST_PHP_ARGS') ?: "$php_args -d extension=$ext");
 
 	if ($php_opts) {
 		$php_args = "$php_args -d " . implode(' -d ', $php_opts);;