diff options
| author | Anatol Belski <ab@php.net> | 2014-09-29 20:30:43 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-29 20:30:43 +0200 |
| commit | df4d559881ed42a6dc2ffbbd6c3ff10ba34df059 (patch) | |
| tree | 2f83634cf40a6bc0954c544d9755e0b3d970a6d6 | |
| parent | cc3849f03924938a528636744443b636498ddf92 (diff) | |
| parent | 7f1239232e569d511912511fede9c2646ce725c9 (diff) | |
| download | php-git-df4d559881ed42a6dc2ffbbd6c3ff10ba34df059.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test filename
| -rw-r--r-- | ext/standard/tests/streams/proc_open_bug51800_right2.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt index 69c75cf263..1e742745c1 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt @@ -2,7 +2,7 @@ Bug #51800 proc_open on Windows hangs forever, the right way to do it with more data --FILE-- <?php -$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php"; +$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right2.php"; $php = PHP_BINARY; $cmd = "$php $callee"; @@ -66,7 +66,7 @@ var_dump(array( ===DONE=== --CLEAN-- <?php -$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php"; +$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right2.php"; unlink($callee); ?> --EXPECTF-- |