Skip to content

Commit fa8c250

Browse files
author
MarcoFalke
committed
ci: Limit scope of some env vars
No need to have a larger scope than needed. Can be reviewed with --color-moved=dimmed-zebra
1 parent 33da5d0 commit fa8c250

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

ci/test/00_setup_env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
6767
# The folder for previous release binaries.
6868
# This folder exists only on the ci guest, and on the ci host as a volume.
6969
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases}
70-
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
7170
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison}
7271
export GOAL=${GOAL:-install}
7372
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}

ci/test/00_setup_env_mac.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
export LC_ALL=C.UTF-8
88

9+
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
10+
911
export CONTAINER_NAME=ci_macos_cross
1012
export CI_IMAGE_NAME_TAG=ubuntu:22.04
1113
export HOST=x86_64-apple-darwin

ci/test/04_install.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
10-
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
11-
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
12-
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
13-
149
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
1510
# Export all env vars to avoid missing some.
1611
# Though, exclude those with newlines to avoid parsing problems.

ci/test/06_script_b.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ export LC_ALL=C.UTF-8
88

99
set -ex
1010

11+
export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
12+
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
13+
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
14+
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
15+
1116
if [ "$CI_OS_NAME" == "macos" ]; then
1217
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
1318
echo "Number of CPUs: $(sysctl -n hw.logicalcpu)"

0 commit comments

Comments
 (0)