File tree 3 files changed +5
-5
lines changed
3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -41,11 +41,11 @@ export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
41
41
# Folder where the build is done (depends and dist). Can not be changed and is equal to the root of the git repo
42
42
export BASE_BUILD_DIR=${BASE_BUILD_DIR:- $BASE_ROOT_DIR }
43
43
# Folder where the build is done (bin and lib). Can not be changed.
44
- export BASE_OUTDIR=${BASE_OUTDIR:- $BASE_BUILD_DIR / out/ $HOST }
44
+ export BASE_OUTDIR=${BASE_OUTDIR:- $BASE_SCRATCH_DIR / out/ $HOST }
45
45
export SDK_URL=${SDK_URL:- https:// bitcoincore.org/ depends-sources/ sdks}
46
46
export WINEDEBUG=${WINEDEBUG:- fixme-all}
47
47
export DOCKER_PACKAGES=${DOCKER_PACKAGES:- build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git}
48
48
export GOAL=${GOAL:- install}
49
- export DIR_QA_ASSETS=${DIR_QA_ASSETS:- ${BASE_BUILD_DIR } / qa-assets}
49
+ export DIR_QA_ASSETS=${DIR_QA_ASSETS:- ${BASE_SCRATCH_DIR } / qa-assets}
50
50
export PATH=${BASE_ROOT_DIR} /ci/retry:$PATH
51
51
export CI_RETRY_EXE=${CI_RETRY_EXE: retry}
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ mkdir -p "${CCACHE_DIR}"
35
35
36
36
export ASAN_OPTIONS=" detect_stack_use_after_return=1"
37
37
export LSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/lsan"
38
- export TSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/tsan:log_path=${BASE_BUILD_DIR } /sanitizer-output/tsan"
38
+ export TSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/tsan:log_path=${BASE_SCRATCH_DIR } /sanitizer-output/tsan"
39
39
export UBSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1"
40
40
env | grep -E ' ^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env
41
41
if [[ $HOST = * -mingw32 ]]; then
@@ -88,7 +88,7 @@ if [ ! -d ${DIR_QA_ASSETS} ]; then
88
88
fi
89
89
export DIR_FUZZ_IN=${DIR_QA_ASSETS} /fuzz_seed_corpus/
90
90
91
- DOCKER_EXEC mkdir -p " ${BASE_BUILD_DIR } /sanitizer-output/"
91
+ DOCKER_EXEC mkdir -p " ${BASE_SCRATCH_DIR } /sanitizer-output/"
92
92
93
93
if [ -z " $RUN_CI_ON_HOST " ]; then
94
94
echo " Create $BASE_BUILD_DIR "
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOI
47
47
END_FOLD
48
48
49
49
set -o errtrace
50
- trap ' DOCKER_EXEC "cat ${BASE_BUILD_DIR }/sanitizer-output/* 2> /dev/null"' ERR
50
+ trap ' DOCKER_EXEC "cat ${BASE_SCRATCH_DIR }/sanitizer-output/* 2> /dev/null"' ERR
51
51
52
52
BEGIN_FOLD build
53
53
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo " Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
You can’t perform that action at this time.
0 commit comments