diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-02-20 12:17:10 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | b28b3f60a105af9b7ea05637b367429a3b6852c9 (patch) | |
| tree | fb2e2d64abdc267605efe057ac12728c69624e67 /tools | |
| parent | d08c39c21884b73d9bd2a0cfd0e6b8851444d391 (diff) | |
| download | protobuf-b28b3f60a105af9b7ea05637b367429a3b6852c9.tar.gz protobuf-b28b3f60a105af9b7ea05637b367429a3b6852c9.tar.bz2 protobuf-b28b3f60a105af9b7ea05637b367429a3b6852c9.zip | |
Configure ccache directory.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/build_and_run_docker.sh | 6 | ||||
| -rwxr-xr-x | tools/run_tests/tests.sh | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/jenkins/build_and_run_docker.sh b/tools/jenkins/build_and_run_docker.sh index e77ffd61..448b00c0 100755 --- a/tools/jenkins/build_and_run_docker.sh +++ b/tools/jenkins/build_and_run_docker.sh @@ -52,12 +52,18 @@ docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR # Choose random name for docker container CONTAINER_NAME="build_and_run_docker_$(uuidgen)" +# Ensure existence of ccache directory +CCACHE_DIR=/tmp/protobuf-ccache +mkdir -p $CCACHE_DIR + # Run command inside docker docker run \ "$@" \ + -e CCACHE_DIR=$CCACHE_DIR \ -e EXTERNAL_GIT_ROOT="/var/local/jenkins/protobuf" \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -v "$git_root:/var/local/jenkins/protobuf:ro" \ + -v $CCACHE_DIR:$CCACHE_DIR \ -w /var/local/git/protobuf \ --name=$CONTAINER_NAME \ $DOCKER_IMAGE_NAME \ diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh index 7ada81f8..353ce62d 100755 --- a/tools/run_tests/tests.sh +++ b/tools/run_tests/tests.sh @@ -103,7 +103,7 @@ use_java() { } # --batch-mode supresses download progress output that spams the logs. -MVN=mvn --batch-mode +MVN="mvn --batch-mode" build_java() { # Java build needs `protoc`. @@ -125,7 +125,7 @@ build_java_with_conformance_tests() { build_javanano() { # Java build needs `protoc`. internal_build_cpp - cd javanano && mvn test && cd .. + cd javanano && $MVN test && cd .. } build_java_jdk6() { |