Skip to content

Commit bb0931e

Browse files
committed
1 parent 6ee8cf1 commit bb0931e

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

ci/build.sh

+11-8
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ ZUUL_PROJECT_SRC_DIR=$HOME/$(jq < ~/zuul-env.json -r ".projects[] | select(.name
1010
ZUUL_PROJECT_SHORT_NAME=$(jq < ~/zuul-env.json -r ".projects[] | select(.name == \"${LEAF_PROJECT_NAME}\").short_name")
1111
ZUUL_GERRIT_HOSTNAME=$(jq < ~/zuul-env.json -r '.project.canonical_hostname')
1212
ZUUL_JOB_NAME_NO_PROJECT=${ZUUL_JOB_NAME##${ZUUL_PROJECT_SHORT_NAME}-}
13+
ZUUL_SRC_COMMON_PREFIX=${ZUUL_PROJECT_SRC_DIR:0:-${#LEAF_PROJECT_NAME}}
1314

1415
CI_PARALLEL_JOBS=$(awk -vcpu=$(getconf _NPROCESSORS_ONLN) 'BEGIN{printf "%.0f", cpu*1.3+1}')
1516
CMAKE_OPTIONS=""
16-
CFLAGS=""
17-
CXXFLAGS=""
17+
CFLAGS="-O2 -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
18+
CXXFLAGS="-O2 -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
1819
LDFLAGS=""
1920

2021
if [[ $ZUUL_JOB_NAME =~ .*-clang.* ]]; then
@@ -30,15 +31,17 @@ if [[ $ZUUL_JOB_NAME =~ .*-ubsan ]]; then
3031
export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
3132
fi
3233

33-
if [[ $ZUUL_JOB_NAME =~ .*-asan ]]; then
34-
export CFLAGS="-fsanitize=address ${CFLAGS}"
35-
export CXXFLAGS="-fsanitize=address ${CXXFLAGS}"
36-
export LDFLAGS="-fsanitize=address ${LDFLAGS}"
34+
if [[ $ZUUL_JOB_NAME =~ .*-asan-ubsan ]]; then
35+
export CFLAGS="-fsanitize=address,undefined -Wp,-U_FORTIFY_SOURCE ${CFLAGS}"
36+
export CXXFLAGS="-fsanitize=address,undefined -Wp,-U_FORTIFY_SOURCE ${CXXFLAGS}"
37+
export LDFLAGS="-fsanitize=address,undefined ${LDFLAGS}"
38+
export ASAN_OPTIONS=intercept_tls_get_addr=0,log_to_syslog=true,handle_abort=2,strip_path_prefix=${ZUUL_SRC_COMMON_PREFIX}
39+
export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
3740
fi
3841

3942
if [[ $ZUUL_JOB_NAME =~ .*-tsan ]]; then
40-
export CFLAGS="-fsanitize=thread ${CFLAGS}"
41-
export CXXFLAGS="-fsanitize=thread ${CXXFLAGS}"
43+
export CFLAGS="-fsanitize=thread -Wp,-U_FORTIFY_SOURCE ${CFLAGS}"
44+
export CXXFLAGS="-fsanitize=thread -Wp,-U_FORTIFY_SOURCE ${CXXFLAGS}"
4245
export LDFLAGS="-fsanitize=thread ${LDFLAGS}"
4346
export TSAN_OPTIONS="suppressions=$HOME/target/tsan.supp"
4447
fi

0 commit comments

Comments
 (0)