Skip to content
Bitcoin Roots

v29.4-roots.4 · Commit 22: [PATCH 22/37] ci: consolidate sanitizer and apt workflows

ci/test/03_test_script.sh

Before: ci/test/03_test_script.sh · After: ci/test/03_test_script.sh

File metadata
index e7fc246894d9753e7298baec02b9e3a3e4f9288f..eb79b12d13ece053e65a2a80a41e15a02ccb23eb 100755

Download original patch · Release notes

Diff rows 1–17 of 17. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.

ci/test/03_test_script.sh CHANGED
@@ -8,6 +8,9 @@ export LC_ALL=C.UTF-8
8
8
 
9
9
  set -ex
10
10
 
11
+ # shellcheck source=apt.sh
12
+ source "$(dirname "${BASH_SOURCE[0]}")/apt.sh"
13
+
11
14
  export ASAN_OPTIONS="detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
12
15
  export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
13
16
  export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:second_deadlock_stack=1"
@@ -28,7 +31,7 @@ df -h
28
31
  # kernel mismatch between a cached docker image and the underlying host.
29
32
  # This can happen occasionally on hosted runners if the runner image is updated.
30
33
  if [[ "$CONTAINER_NAME" == "ci_native_asan" ]]; then
31
- $CI_RETRY_EXE apt-get update
34
+ ci_retry_apt_update
32
35
  ${CI_RETRY_EXE} bash -c "apt-get install --no-install-recommends --no-upgrade -y $PACKAGES"
33
36
  fi
34
37