diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-10 04:46:03 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-10 18:28:13 +0200 |
| commit | a9ef765bfcd2fbc8c588ea1cdcb5681547fc364f (patch) | |
| tree | 994980c251f49f07973212a736fc1a6b88cfbd66 /.travis.yml | |
| parent | 9f72864caf46f292d0f0ce34baa5ec0e1beb7739 (diff) | |
| parent | e2ecc508415b95526563eb7b70510e015b9a004e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into sanity
Conflicts:
tools/run_tests/run_tests.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 1cd0aeedb7..7d8634506c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,12 @@ env: - CONFIG=opt TEST=python - CONFIG=gcov TEST=c - CONFIG=gcov TEST=c++ + - USE_GCC=4.4 CONFIG=opt TEST=build + - USE_GCC=4.5 CONFIG=opt TEST=build script: - rvm use $RUBY_VERSION - gem install bundler + - if [ ! -z "$USE_GCC" ] ; then export CC=gcc-$USE_GCC ; export CXX=g++-$USE_GCC ; fi - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0 after_success: - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens -b. --gcov-options '\-p' ; fi |