From faeeca87b65dd98e0efbc54443b3f8854cae9c00 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 20 Nov 2019 19:10:55 -0500 Subject: 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- --- ci/test/04_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/test/04_install.sh') diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index ce41c37b6e..fe9a031b8d 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -35,7 +35,7 @@ mkdir -p "${CCACHE_DIR}" export ASAN_OPTIONS="detect_stack_use_after_return=1" export LSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/lsan" -export TSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/tsan:log_path=${BASE_BUILD_DIR}/sanitizer-output/tsan" +export TSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/tsan:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan" export UBSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1" env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env if [[ $HOST = *-mingw32 ]]; then @@ -88,7 +88,7 @@ if [ ! -d ${DIR_QA_ASSETS} ]; then fi export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/ -DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}/sanitizer-output/" +DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/" if [ -z "$RUN_CI_ON_HOST" ]; then echo "Create $BASE_BUILD_DIR" -- cgit v1.2.3 From fa041875284d01602647519cc452185ba1ad5a8f Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 20 Nov 2019 19:40:22 -0500 Subject: scripted-diff: Use ci DEPENDS_DIR, remove BASE_BUILD_DIR -BEGIN VERIFY SCRIPT- # Use ci DEPENDS_DIR sed -i -e 's|BASE_BUILD_DIR/depends|DEPENDS_DIR|g' $(git grep -l depends ci) sed -i -e 's| depends/| ${DEPENDS_DIR}/|g' $(git grep -l depends ci) # Remove redundant alias sed -i -e 's|BASE_BUILD_DIR|BASE_ROOT_DIR|g' $(git grep -l BASE_BUILD_DIR ci) -END VERIFY SCRIPT- --- ci/test/04_install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ci/test/04_install.sh') diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index fe9a031b8d..20e7ad4a14 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -34,9 +34,9 @@ mkdir -p "${BASE_SCRATCH_DIR}" mkdir -p "${CCACHE_DIR}" export ASAN_OPTIONS="detect_stack_use_after_return=1" -export LSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/lsan" -export TSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/tsan:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan" -export UBSAN_OPTIONS="suppressions=${BASE_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1" +export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan" +export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan" +export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1" env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN" @@ -49,10 +49,10 @@ if [ -z "$RUN_CI_ON_HOST" ]; then ${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG" DOCKER_ID=$(docker run $DOCKER_ADMIN -idt \ - --mount type=bind,src=$BASE_BUILD_DIR,dst=/ro_base,readonly \ + --mount type=bind,src=$BASE_ROOT_DIR,dst=/ro_base,readonly \ --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR \ - --mount type=bind,src=$BASE_BUILD_DIR/depends,dst=$BASE_BUILD_DIR/depends \ - -w $BASE_BUILD_DIR \ + --mount type=bind,src=$DEPENDS_DIR,dst=$DEPENDS_DIR \ + -w $BASE_ROOT_DIR \ --env-file /tmp/env \ $DOCKER_NAME_TAG) @@ -91,8 +91,8 @@ export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/ DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/" if [ -z "$RUN_CI_ON_HOST" ]; then - echo "Create $BASE_BUILD_DIR" - DOCKER_EXEC rsync -a /ro_base/ $BASE_BUILD_DIR + echo "Create $BASE_ROOT_DIR" + DOCKER_EXEC rsync -a /ro_base/ $BASE_ROOT_DIR fi if [ "$USE_BUSY_BOX" = "true" ]; then -- cgit v1.2.3 From fad88e6f86d1dd32cf01db2287df9c63e66c5116 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 22 Nov 2019 13:58:53 -0500 Subject: ci: Remove use of cd --- ci/test/04_install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ci/test/04_install.sh') diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 20e7ad4a14..2a1983b1c5 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -44,6 +44,8 @@ elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (A DOCKER_ADMIN="--cap-add SYS_PTRACE" fi +export P_CI_DIR="$PWD" + if [ -z "$RUN_CI_ON_HOST" ]; then echo "Creating $DOCKER_NAME_TAG container to run in" ${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG" @@ -57,12 +59,12 @@ if [ -z "$RUN_CI_ON_HOST" ]; then $DOCKER_NAME_TAG) DOCKER_EXEC () { - docker exec $DOCKER_ID bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $PWD && $*" + docker exec $DOCKER_ID bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*" } else echo "Running on host system without docker wrapper" DOCKER_EXEC () { - bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $PWD && $*" + bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*" } fi -- cgit v1.2.3