Skip to content

Unblock tests under ASan on Windows #17079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Unblock tests under ASan on Windows #17079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/tests/file/bug72035.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $cmd = "$cgi -n -C $fl";

/* Need to run CGI with the env reset. */
$desc = array(0 => array("pipe", "r"));
$proc = proc_open($cmd, $desc, $pipes, getcwd(), array());
$proc = proc_open($cmd, $desc, $pipes, getcwd(), array('PATH' => getenv('PATH')));
if (is_resource($proc)) {
echo stream_get_contents($pipes[0]);

Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/file/proc_open01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ($php === false) {
$proc = proc_open(
"$php -n",
array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
$pipes, getcwd(), array(), array()
$pipes, getcwd(), array('PATH' => getenv('PATH')), array()
);
if ($proc === false) {
print "something went wrong.\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/general_functions/proc_open_array.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fpassthru($pipes[1]);
proc_close($proc);

putenv('ENV_1=ENV_1');
$env = ['ENV_2' => 'ENV_2'];
$env = ['ENV_2' => 'ENV_2', 'PATH' => getenv('PATH')];
$cmd = [$php, '-n', '-r', 'var_dump(getenv("ENV_1"), getenv("ENV_2"));'];

echo "\nEnvironment inheritance:\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/streams/proc_open_bug60120.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $process = proc_open(
],
$pipes,
getcwd(),
[],
['PATH' => getenv('PATH')],
[
'suppress_errors' => true,
'bypass_shell' => false
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/streams/proc_open_bug64438.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'))
$stdin = str_repeat('*', 4097);

$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
$process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
$process = proc_open($cmd, $descriptors, $pipes, getcwd(), array('PATH' => getenv('PATH')), $options);

foreach ($pipes as $pipe) {
stream_set_blocking($pipe, false);
Expand Down
Loading