mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
fix run-tests.php (Felipe)
This commit is contained in:
parent
6e8e023eb9
commit
19e44a3234
@ -920,12 +920,12 @@ function system_with_timeout($commandline, $env = null, $stdin = null)
|
||||
0 => array('pipe', 'r'),
|
||||
1 => array('pipe', 'w'),
|
||||
2 => array('pipe', 'w')
|
||||
), $pipes, null, $env, array("suppress_errors" => true));
|
||||
), $pipes, null, $env, array("suppress_errors" => true, "binary_pipes" => true));
|
||||
|
||||
if (!$proc)
|
||||
return false;
|
||||
|
||||
if (is_string($stdin)) {
|
||||
if (!is_null($stdin)) {
|
||||
fwrite($pipes[0], $stdin);
|
||||
}
|
||||
fclose($pipes[0]);
|
||||
@ -1655,7 +1655,7 @@ COMMAND $cmd
|
||||
$wanted = trim($section_text['EXPECT']);
|
||||
if ($unicode_semantics && is_unicode($wanted)) {
|
||||
/* workaround until preg_replace() or str_replace() are upgraded */
|
||||
$wanted = unicode_encode($wanted, ini_get('unicode.output_encoding'));
|
||||
$wanted = unicode_encode($wanted, ini_get('unicode.output_encoding') ?: 'utf-8');
|
||||
}
|
||||
$wanted = preg_replace('/\r\n/',"\n",$wanted);
|
||||
show_file_block('exp', $wanted);
|
||||
|
Loading…
Reference in New Issue
Block a user