diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2016-11-18 17:00:59 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-11-18 17:36:42 -0800 |
commit | 780793255d34bb0c5ac5b2b6a09f523c2453db42 (patch) | |
tree | 8f5c13aca97d83e2baa6fb11ef07bfbf46de415c /jenkins/pull_request_in_docker.sh | |
parent | 599613e4c481781ad91cc8fba47e795ef15d7e5a (diff) | |
download | protobuf-780793255d34bb0c5ac5b2b6a09f523c2453db42.tar.gz protobuf-780793255d34bb0c5ac5b2b6a09f523c2453db42.tar.bz2 protobuf-780793255d34bb0c5ac5b2b6a09f523c2453db42.zip |
Restore jenkins files.
The last up-integration from github to google3 was made at commit
e28286fa05d8327fd6c5aa70cfb3be558f0932b8 but somehow the change in
that commit is not actually in the up-integration CL and as a result
that change was reverted by the down-integration. Restoring them
should make the jenkins tests running again.
Diffstat (limited to 'jenkins/pull_request_in_docker.sh')
-rwxr-xr-x | jenkins/pull_request_in_docker.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/jenkins/pull_request_in_docker.sh b/jenkins/pull_request_in_docker.sh index 78a9253a..10daf0a5 100755 --- a/jenkins/pull_request_in_docker.sh +++ b/jenkins/pull_request_in_docker.sh @@ -45,19 +45,11 @@ 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. +# Other tests are run in parallel. TEST_SET is defined in +# buildcmds/pull_request{_32}.sh parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \ - csharp \ - java_jdk7 \ - javanano_jdk7 \ - java_oracle7 \ - javanano_oracle7 \ - python \ - python_cpp \ - ruby_all \ - javascript \ - golang \ + $TEST_SET \ || true # Process test results even if tests fail. cat $OUTPUT_DIR/joblog |