Skip to content

Commit faeeca8

Browse files
author
MarcoFalke
committed
scripted-diff: Move various folders to ci scratch dir
-BEGIN VERIFY SCRIPT- # move ci sanitizer-output sed -i -e 's|BASE_BUILD_DIR}/sanitizer-output|BASE_SCRATCH_DIR}/sanitizer-output|g' $(git grep -l BASE_BUILD_DIR ci) # move qa-assets sed -i -e 's|BASE_BUILD_DIR}/qa-assets|BASE_SCRATCH_DIR}/qa-assets|g' $(git grep -l BASE_BUILD_DIR ci) # move out dir sed -i -e 's|BASE_BUILD_DIR/out|BASE_SCRATCH_DIR/out|g' $(git grep -l BASE_BUILD_DIR ci) -END VERIFY SCRIPT-
1 parent 41162c0 commit faeeca8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ci/test/00_setup_env.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
4141
# Folder where the build is done (depends and dist). Can not be changed and is equal to the root of the git repo
4242
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_ROOT_DIR}
4343
# 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}
4545
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
4646
export WINEDEBUG=${WINEDEBUG:-fixme-all}
4747
export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git}
4848
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}
5050
export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH
5151
export CI_RETRY_EXE=${CI_RETRY_EXE:retry}

ci/test/04_install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ mkdir -p "${CCACHE_DIR}"
3535

3636
export ASAN_OPTIONS="detect_stack_use_after_return=1"
3737
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"
3939
export UBSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1"
4040
env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env
4141
if [[ $HOST = *-mingw32 ]]; then
@@ -88,7 +88,7 @@ if [ ! -d ${DIR_QA_ASSETS} ]; then
8888
fi
8989
export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/
9090

91-
DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}/sanitizer-output/"
91+
DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
9292

9393
if [ -z "$RUN_CI_ON_HOST" ]; then
9494
echo "Create $BASE_BUILD_DIR"

ci/test/06_script_a.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOI
4747
END_FOLD
4848

4949
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
5151

5252
BEGIN_FOLD build
5353
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )

0 commit comments

Comments
 (0)