From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Fri, 12 Sep 2008 14:14:52 +0000 (+0000)
Subject: Fix cwd when running tests out of tree with ZTS builds (fixes #45837)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~418
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85d781f41d7994bdb520dd58a516671a7922e8ad;p=php

Fix cwd when running tests out of tree with ZTS builds (fixes #45837)
---

diff --git a/run-tests.php b/run-tests.php
index 8ea1aeda48..7f1435e29e 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -996,7 +996,7 @@ function error_report($testname, $logname, $tested)
 
 function system_with_timeout($commandline, $env = null, $stdin = null)
 {
-	global $leak_check;
+	global $leak_check, $cwd;
 
 	$data = '';
 
@@ -1009,7 +1009,7 @@ function system_with_timeout($commandline, $env = null, $stdin = null)
 		0 => array('pipe', 'r'),
 		1 => array('pipe', 'w'),
 		2 => array('pipe', 'w')
-		), $pipes, null, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true));
+		), $pipes, $cwd, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true));
 
 	if (!$proc) {
 		return false;