diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-03-02 10:42:56 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-03-02 10:42:56 -0800 |
| commit | aa88dced55cbc4c5bdcbc572317547ee7acf4e28 (patch) | |
| tree | 0ca90fb641557852e9e8ee0f1b2a51f8429bf061 /.travis.yml | |
| parent | cedab130c2de43a5bde281f03ee25012c47c2034 (diff) | |
| parent | 410f44f70a927e9e8573269b347b40519ac1f740 (diff) | |
Merge branch 'master' into travis_python
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 1099aa5dfc..de320b59a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: cpp before_install: - sudo add-apt-repository ppa:yjwong/gflags -y + - sudo add-apt-repository ppa:h-rayflood/llvm -y - sudo apt-get update -qq - - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv + - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv clang-3.5 env: global: - RUBY_VERSION=2.1 @@ -17,6 +18,6 @@ env: script: - rvm use $RUBY_VERSION - gem install bundler - - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 2.0 + - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0 notifications: email: false
\ No newline at end of file |