Skip to content

Commit 6be93b2

Browse files
committed
Don't generate script for proc_open_pipes tests
Commit the generated script instead, which is much simpler than the code generating it...
1 parent e27ba75 commit 6be93b2

File tree

5 files changed

+5
-51
lines changed

5 files changed

+5
-51
lines changed

ext/standard/tests/general_functions/proc_open_pipes.inc

Lines changed: 0 additions & 21 deletions
This file was deleted.

ext/standard/tests/general_functions/proc_open_pipes1.phpt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,17 @@ proc_open() with > 16 pipes
33
--FILE--
44
<?php
55

6-
include dirname(__FILE__) . "/proc_open_pipes.inc";
7-
86
for ($i = 3; $i<= 30; $i++) {
97
$spec[$i] = array('pipe', 'w');
108
}
119

1210
$php = getenv("TEST_PHP_EXECUTABLE");
13-
$callee = create_sleep_script();
11+
$callee = __DIR__ . "/proc_open_pipes_sleep.inc";
1412
proc_open("$php -n $callee", $spec, $pipes);
1513

1614
var_dump(count($spec));
1715
var_dump($pipes);
1816

19-
?>
20-
--CLEAN--
21-
<?php
22-
include dirname(__FILE__) . "/proc_open_pipes.inc";
23-
24-
unlink_sleep_script();
25-
2617
?>
2718
--EXPECTF--
2819
int(28)

ext/standard/tests/general_functions/proc_open_pipes2.phpt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,15 @@ proc_open() with no pipes
33
--FILE--
44
<?php
55

6-
include dirname(__FILE__) . "/proc_open_pipes.inc";
7-
86
$spec = array();
97

108
$php = getenv("TEST_PHP_EXECUTABLE");
11-
$callee = create_sleep_script();
9+
$callee = __DIR__ . "/proc_open_pipes_sleep.inc";
1210
proc_open("$php -n $callee", $spec, $pipes);
1311

1412
var_dump(count($spec));
1513
var_dump($pipes);
1614

17-
?>
18-
--CLEAN--
19-
<?php
20-
include dirname(__FILE__) . "/proc_open_pipes.inc";
21-
22-
unlink_sleep_script();
23-
2415
?>
2516
--EXPECT--
2617
int(0)

ext/standard/tests/general_functions/proc_open_pipes3.phpt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ proc_open() with invalid pipes
33
--FILE--
44
<?php
55

6-
include dirname(__FILE__) . "/proc_open_pipes.inc";
7-
86
for ($i = 3; $i<= 5; $i++) {
97
$spec[$i] = array('pipe', 'w');
108
}
119

1210
$php = getenv("TEST_PHP_EXECUTABLE");
13-
$callee = create_sleep_script();
11+
$callee = __DIR__ . "/proc_open_pipes_sleep.inc";
1412

1513
$spec[$i] = array('pi');
1614
proc_open("$php -n $callee", $spec, $pipes);
@@ -27,13 +25,6 @@ proc_open("$php -n $callee", $spec, $pipes);
2725
var_dump($pipes);
2826

2927
echo "END\n";
30-
?>
31-
--CLEAN--
32-
<?php
33-
include dirname(__FILE__) . "/proc_open_pipes.inc";
34-
35-
unlink_sleep_script();
36-
3728
?>
3829
--EXPECTF--
3930
Warning: proc_open(): pi is not a valid descriptor spec/mode in %s on line %d
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?php
2+
sleep(1);

0 commit comments

Comments
 (0)