diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2017-04-02 20:39:01 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-04-06 11:26:34 -0400 |
| commit | 08359bc570dc4a078c025e5650d303954df244ac (patch) | |
| tree | 372037faac876c86c475559c9d96a68e8bca0626 /.travis.yml | |
| parent | 3bfb0b3bbd019e722add5ea3777bfdb3b8e2e9f8 (diff) | |
| download | mariadb-git-08359bc570dc4a078c025e5650d303954df244ac.tar.gz | |
travis: OSX - 2 minute test case timeout
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ee43ff2cf63..31141a3dec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,10 @@ matrix: -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON -DWITHOUT_MROONGA_STORAGE_ENGINE=ON - make -j 4 - cd mysql-test - - ./mtr --force --parallel=4 --skip-rpl --suite=main,innodb --skip-test-list=unstable-tests + - ./mtr --force --parallel=4 --testcase-timeout=2 + --suite=main,innodb + --skip-rpl + --skip-test-list=unstable-tests - ccache --show-stats # - env: |