diff options
| author | Michael Wallner <mike@php.net> | 2013-09-16 09:35:29 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-09-16 09:35:29 +0200 |
| commit | 6dff371a353545607fe03bfee8a90790a991c4cf (patch) | |
| tree | f5fae2c3be3b40565c70f7676455d174cf05d168 | |
| parent | 52bd9f05ead1803e4deacb86affe3bf9ca47b68e (diff) | |
| parent | b5283b9b7abecde841eb268c4b158cd76630d53b (diff) | |
| download | php-git-6dff371a353545607fe03bfee8a90790a991c4cf.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
double test timeout for travis
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index d149772e31..07653040dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,4 +29,4 @@ before_script: - . ./travis/ext/pdo_pgsql/setup.sh # Run PHPs run-tests.php -script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff +script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 |