diff options
| author | Anatol Belski <ab@php.net> | 2017-07-28 00:27:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-28 00:27:52 +0200 |
| commit | 55e7459cea101384c386821b4560a32d2f48aa8d (patch) | |
| tree | ea4236a661ba5506249fe93c029750dbb77e6742 /ext | |
| parent | b62fb3aa0c7968b9f478df355b18b7343efe87e0 (diff) | |
| parent | b01336814d17544a4f16784d5bb041ae068486d6 (diff) | |
| download | php-git-55e7459cea101384c386821b4560a32d2f48aa8d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
relax test on travis
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/tests/streams/proc_open_bug69900.phpt | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index 86e323eb05..76c8ff4a17 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -6,6 +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; $test_content = '<?php @@ -33,7 +34,7 @@ for($i = 0; $i < 10; $i++){ $t1 = microtime(1); echo $s; - echo "fgets() took ", (($t1 - $t0)*1000 > 1 ? 'more' : 'less'), " than 1 ms\n"; + echo "fgets() took ", (($t1 - $t0)*1000 > $max_ms ? 'more' : 'less'), " than $max_ms ms\n"; } fclose($pipes[0]); @@ -48,25 +49,25 @@ proc_close($process); $fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test69900.php"; @unlink($fl); ?> ---EXPECT-- +--EXPECTF-- hello0 -fgets() took more than 1 ms +fgets() took more than %d ms hello1 -fgets() took less than 1 ms +fgets() took less than %d ms hello2 -fgets() took less than 1 ms +fgets() took less than %d ms hello3 -fgets() took less than 1 ms +fgets() took less than %d ms hello4 -fgets() took less than 1 ms +fgets() took less than %d ms hello5 -fgets() took less than 1 ms +fgets() took less than %d ms hello6 -fgets() took less than 1 ms +fgets() took less than %d ms hello7 -fgets() took less than 1 ms +fgets() took less than %d ms hello8 -fgets() took less than 1 ms +fgets() took less than %d ms hello9 -fgets() took less than 1 ms +fgets() took less than %d ms ===DONE=== |