diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | jenkins/pull_request_in_docker.sh | 1 |
2 files changed, 7 insertions, 4 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 diff --git a/jenkins/pull_request_in_docker.sh b/jenkins/pull_request_in_docker.sh index a99d88b1..78a9253a 100755 --- a/jenkins/pull_request_in_docker.sh +++ b/jenkins/pull_request_in_docker.sh @@ -48,7 +48,6 @@ $TIME_CMD $TEST_SCRIPT cpp > >(tee $CPP_STDOUT) 2> >(tee $CPP_STDERR >&2) # Other tests are run in parallel. parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \ - cpp_distcheck \ csharp \ java_jdk7 \ javanano_jdk7 \ |