diff options
author | Anatol Belski <ab@php.net> | 2017-08-03 15:07:47 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-08-03 15:07:47 +0200 |
commit | 21c6ba3412ef863652bb05dfedcd4a8d8f4f044c (patch) | |
tree | fe131017e771948dd3dc0a33f6c7eddd7e140f17 | |
parent | 54e2224df7316dce94d15e596985551ff8bdb3ea (diff) | |
parent | 9689796c10b83febf5c08f411ac44232844ff53d (diff) | |
download | php-git-21c6ba3412ef863652bb05dfedcd4a8d8f4f044c.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Increase expected timing on Travis
-rw-r--r-- | ext/standard/tests/streams/proc_open_bug69900.phpt | 2 |
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 76c8ff4a17..d55af3c769 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -6,7 +6,7 @@ Bug #69900 Commandline input/output weird behaviour with STDIO error_reporting(E_ALL); $fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test69900.php"; -$max_ms = ((bool)getenv('TRAVIS')) ? 3 : 1; +$max_ms = ((bool)getenv('TRAVIS')) ? 5 : 1; $test_content = '<?php |