Skip to content

Commit fa40e48

Browse files
author
MarcoFalke
committed
ci: Remove unparseable lines from supp file for old xenial clang tsan
1 parent fa1bfc4 commit fa40e48

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

ci/test/00_setup_env.sh

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

77
export LC_ALL=C.UTF-8
88

9+
# The root dir.
10+
# The ci system copies this folder.
11+
# This is where the build is done (depends and dist).
12+
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
13+
export BASE_ROOT_DIR
14+
915
echo "Setting specific values in env"
1016
if [ -n "${FILE_ENV}" ]; then
1117
set -o errexit;
1218
# shellcheck disable=SC1090
1319
source "${FILE_ENV}"
1420
fi
1521

16-
# The root dir.
17-
# The ci system copies this folder.
18-
# This is where the build is done (depends and dist).
19-
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
20-
export BASE_ROOT_DIR
21-
2222
echo "Fallback to default values in env (if not yet set)"
2323
# The number of parallel jobs to pass down to make and test_runner.py
2424
export MAKEJOBS=${MAKEJOBS:--j4}

ci/test/00_setup_env_native_tsan.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-
1111
export NO_DEPENDS=1
1212
export GOAL="install"
1313
export BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=qt5 CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"
14+
15+
# xenial comes with old clang versions that can not parse the sanitizer suppressions files
16+
# Remove unparseable lines as a hacky workaround
17+
sed -i '/^implicit-/d' "${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan"

0 commit comments

Comments
 (0)