diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
| commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
| tree | 6224f98ad30e99dc2d896423853892f2142f16ed /kokoro/linux/cpp_distcheck/build.sh | |
| parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
| parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
| download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip | |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'kokoro/linux/cpp_distcheck/build.sh')
| -rwxr-xr-x | kokoro/linux/cpp_distcheck/build.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kokoro/linux/cpp_distcheck/build.sh b/kokoro/linux/cpp_distcheck/build.sh index b8b57e35..89b8379e 100755 --- a/kokoro/linux/cpp_distcheck/build.sh +++ b/kokoro/linux/cpp_distcheck/build.sh @@ -5,7 +5,15 @@ # Change to repo root cd $(dirname $0)/../../.. -# Prepare worker environment to run tests -source kokoro/linux/prepare_build_linux_rc - ./tests.sh cpp_distcheck + +# Run tests under release docker image. +DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ") +docker pull $DOCKER_IMAGE_NAME + +docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \ + bash -l /var/local/protobuf/tests.sh cpp || FAILED="true" + +if [ "$FAILED" = "true" ]; then + exit 1 +fi |