aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2016-07-22 16:04:11 -0700
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2016-07-22 16:04:11 -0700
commit9702b9f78508dcbb2df4d090cdac6c3df41cdddb (patch)
treed81452a15159ef745ddb6b95870effe997d46375 /.travis.yml
parentc2ced9ad485fc987ec02a9268751f663f70f416e (diff)
Keep cpp_distcheck on travis for now.
When it runs in parallel with other jenkins tests, multiple tests start to fail probably because cpp_distcheck will update the C++ lib that other tests (such as python_cpp) are depending on. Change-Id: Ibca0243084bb6b81c811b62c75288e20cc2aabf5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index c4717acf..1417cb98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,13 +46,17 @@ matrix:
# which doesn't work on OS X.
- os: osx
env: CONFIG=golang
- # The dotnet environment requires Ubuntu 14.04 or 16.04. This
- # configuration is effectively an "extra" one, outside the
- # autogenerated matrix.
include:
+ # The dotnet environment requires Ubuntu 14.04 or 16.04. This
+ # configuration is effectively an "extra" one, outside the
+ # autogenerated matrix.
- os: linux
env: CONFIG=csharp
dist: trusty
+ # This test is kept on travis because it doesn't play nicely with other
+ # tests on jenkins running in parallel.
+ - os: linux
+ env: CONFIG=cpp_distcheck
allow_failures:
# These currently do not work on OS X but are being worked on by @haberman.
- os: osx