diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-26 16:49:31 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-26 16:49:31 -0800 |
| commit | 341e66013dbb59306099c4021fab1b02edbf86d7 (patch) | |
| tree | edeb9caa3547f6d1d12bc2c8aea87106eb769044 /.travis.yml | |
| parent | d6465fc943642df308512e7d3fe8337ef6849d09 (diff) | |
| parent | 878e4b61ae291164f16e1f545f2b441d901a7ebb (diff) | |
Merge github.com:grpc/grpc into travis-c++
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f4a2b22558..a3a0fa2693 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgtest-dev libgflags-dev script: - - ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg - - ./tools/run_tests/run_tests.py -l c -t -j 8 -c opt - - ./tools/run_tests/run_tests.py -l c++ -t -j 8 -c dbg - - ./tools/run_tests/run_tests.py -l c++ -t -j 8 -c opt + - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg + - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt + - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg + - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c opt notifications: email: false |