Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase expected timing on Travis
This commit is contained in:
Anatol Belski 2017-08-03 15:07:47 +02:00
commit 21c6ba3412

View File

@ -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