Skip to content

Commit fa27372

Browse files
author
MarcoFalke
committed
ci: Move CCACHE_DIR and test_runner tmp dir into ./ci/scratch/
1 parent fa60583 commit fa27372

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cache:
3333
directories:
3434
- $TRAVIS_BUILD_DIR/depends/built
3535
- $TRAVIS_BUILD_DIR/depends/sdk-sources
36-
- $HOME/.ccache
36+
- $TRAVIS_BUILD_DIR/ci/scratch/.ccache
3737
stages:
3838
- lint
3939
- test

ci/test/00_setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1$TRAVIS_BUILD_ID}
2424
export CCACHE_SIZE=${CCACHE_SIZE:-100M}
2525
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
2626
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
27-
export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache}
27+
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
2828
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-${TRAVIS_BUILD_DIR:-$BASE_ROOT_DIR}}
2929
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_BUILD_DIR/out/$HOST}
3030
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}

ci/test/04_install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9+
mkdir -p "${BASE_SCRATCH_DIR}"
910
ccache echo "Creating ccache dir if it didn't already exist"
1011

1112
if [ ! -d ${DIR_QA_ASSETS} ]; then

ci/test/06_script_b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616

1717
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
1818
BEGIN_FOLD functional-tests
19-
DOCKER_EXEC test/functional/test_runner.py --ci $MAKEJOBS --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast
19+
DOCKER_EXEC test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast
2020
END_FOLD
2121
fi
2222

0 commit comments

Comments
 (0)