From 3ad8ac4c34a30be3c1b5a0ef877512067003fafa Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 15 Jul 2024 13:38:32 +0300 Subject: [PATCH] fix asan and tsan jobs on Drone (#264) --- .drone.jsonnet | 5 +++-- .drone/drone.sh | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6a6d4b260e..749d513d7a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -10,8 +10,8 @@ local triggers = }; local ubsan = { UBSAN: '1', UBSAN_OPTIONS: 'print_stacktrace=1' }; -local asan = { ASAN: '1', ASAN_OPTIONS: 'privileged=True' }; -local tsan = { TSAN: '1', TSAN_OPTIONS: 'privileged=True' }; +local asan = { ASAN: '1' }; +local tsan = { TSAN: '1' }; local linux_pipeline(name, image, environment, packages = "", sources = [], arch = "amd64") = { @@ -30,6 +30,7 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch name: "everything", image: image, environment: environment, + privileged: true, commands: [ 'set -e', diff --git a/.drone/drone.sh b/.drone/drone.sh index 60f0676018..ed7837bbe6 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -14,6 +14,11 @@ DRONE_BUILD_DIR=$(pwd) BOOST_BRANCH=develop if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi +if [[ $(uname) == "Linux" && ( "$TSAN" == 1 || "$ASAN" == 1 ) ]]; then + echo 0 | sudo tee /proc/sys/kernel/randomize_va_space + sudo sysctl vm.mmap_rnd_bits=28 +fi + cd .. git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root