summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2019-06-05 11:50:20 +0200
committerRemi Collet <remi@php.net>2019-06-05 11:50:20 +0200
commitcd687a49531d397f65d940e026f27291e4851a32 (patch)
treee29fba435a5e43e209cbf2b412834b11b40b23fd
parent21947e37a2f1cf80426f9c0804944bf44d53af73 (diff)
parenta0ce1df024c3351f9859215356268a85ae94c2f7 (diff)
downloadphp-git-cd687a49531d397f65d940e026f27291e4851a32.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: ignore first gets time which is usually a few ms only
-rw-r--r--ext/standard/tests/streams/proc_open_bug69900.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt
index 6e1133a399..65505d09fe 100644
--- a/ext/standard/tests/streams/proc_open_bug69900.phpt
+++ b/ext/standard/tests/streams/proc_open_bug69900.phpt
@@ -57,7 +57,7 @@ $fl = __DIR__ . DIRECTORY_SEPARATOR . "test69900.php";
?>
--EXPECTF--
hello0
-fgets() took more than %d ms (%s ms)
+fgets() took %s
hello1
fgets() took less than %d ms
hello2