| Index: third_party/protobuf/jenkins/pull_request_in_docker.sh
|
| diff --git a/third_party/protobuf/jenkins/pull_request_in_docker.sh b/third_party/protobuf/jenkins/pull_request_in_docker.sh
|
| index 10daf0a593f7b6d94afe06729ec2fcc79f003d04..887f97c59ba3ae8f0197b8226e22a2535fc4a9dc 100755
|
| --- a/third_party/protobuf/jenkins/pull_request_in_docker.sh
|
| +++ b/third_party/protobuf/jenkins/pull_request_in_docker.sh
|
| @@ -45,11 +45,17 @@ TIME_CMD="/usr/bin/time -f %e -o $LOG_OUTPUT_DIR/1/cpp/build_time"
|
|
|
| $TIME_CMD $TEST_SCRIPT cpp > >(tee $CPP_STDOUT) 2> >(tee $CPP_STDERR >&2)
|
|
|
| -# Other tests are run in parallel. TEST_SET is defined in
|
| -# buildcmds/pull_request{_32}.sh
|
| +# Other tests are run in parallel.
|
|
|
| parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \
|
| - $TEST_SET \
|
| + csharp \
|
| + java_jdk7 \
|
| + javanano_jdk7 \
|
| + java_oracle7 \
|
| + javanano_oracle7 \
|
| + python \
|
| + python_cpp \
|
| + ruby21 \
|
| || true # Process test results even if tests fail.
|
|
|
| cat $OUTPUT_DIR/joblog
|
|
|