diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:38:13 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:38:13 +0100 |
| commit | 5527c5b083830ff148a8cef4a61f5fab537b89d5 (patch) | |
| tree | 1a901f6ca2fb56f47a2e29e55c8692a5eba62175 | |
| parent | a4e56194d74b52944e7042940ba570e8143168d0 (diff) | |
| parent | bdd578fcbbd0d75f76a2775dea8c8db1cc47b1f5 (diff) | |
| download | php-git-5527c5b083830ff148a8cef4a61f5fab537b89d5.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | sapi/cli/tests/upload_2G.phpt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt index 313dcd5ac1..bd36ad6cda 100644 --- a/sapi/cli/tests/upload_2G.phpt +++ b/sapi/cli/tests/upload_2G.phpt @@ -21,6 +21,10 @@ if ($f = fopen("/proc/meminfo","r")) { if (empty($enough_free_ram)) { die("skip need +3G free RAM"); } + +if (getenv('TRAVIS')) { + die("skip Fails intermittently on travis"); +} ?> --FILE-- <?php |