aboutsummaryrefslogtreecommitdiff
path: root/jenkins/pull_request_in_docker.sh
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-07-22 16:04:11 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-07-22 16:04:11 -0700
commit9702b9f78508dcbb2df4d090cdac6c3df41cdddb (patch)
treed81452a15159ef745ddb6b95870effe997d46375 /jenkins/pull_request_in_docker.sh
parentc2ced9ad485fc987ec02a9268751f663f70f416e (diff)
downloadprotobuf-9702b9f78508dcbb2df4d090cdac6c3df41cdddb.tar.gz
protobuf-9702b9f78508dcbb2df4d090cdac6c3df41cdddb.tar.bz2
protobuf-9702b9f78508dcbb2df4d090cdac6c3df41cdddb.zip
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 'jenkins/pull_request_in_docker.sh')
-rwxr-xr-xjenkins/pull_request_in_docker.sh1
1 files changed, 0 insertions, 1 deletions
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 \