[infra] Fix the check for COVERAGE_FLAGS overrides in "compile" script. (#907)

* [infra] Fix the check for COVERAGE_FLAGS overrides in "compile" script.

* Add -pthread to coverage flags ("profile" sanitizer).
This commit is contained in:
Max Moroz 2017-10-20 17:15:02 -07:00 committed by GitHub
parent 019ef35f1a
commit 63a6cb31b4
2 changed files with 3 additions and 3 deletions

View File

@ -22,7 +22,7 @@ RUN apt-get install -y git subversion jq python3 zip make libunwind8-dev binutil
ENV SANITIZER_FLAGS_address "-fsanitize=address -fsanitize-address-use-after-scope"
ENV SANITIZER_FLAGS_undefined "-fsanitize=bool,array-bounds,float-divide-by-zero,function,integer-divide-by-zero,return,shift,signed-integer-overflow,vla-bound,vptr -fno-sanitize-recover=undefined"
ENV SANITIZER_FLAGS_memory "-fsanitize=memory -fsanitize-memory-track-origins"
ENV SANITIZER_FLAGS_profile "-fprofile-instr-generate -fcoverage-mapping"
ENV SANITIZER_FLAGS_profile "-fprofile-instr-generate -fcoverage-mapping -pthread"
# Default build flags for coverage.
ENV COVERAGE_FLAGS="-fsanitize-coverage=trace-pc-guard,trace-cmp"

View File

@ -33,8 +33,8 @@ then
fi
# Coverage flag overrides.
COVERAGE_FLAGS_VAR="COVERAGE_FLAGS_$SANITIZER"
if [[ -n ${!COVERAGE_FLAGS_VAR-} ]]
COVERAGE_FLAGS_VAR="COVERAGE_FLAGS_${SANITIZER}"
if [[ -n ${!COVERAGE_FLAGS_VAR+x} ]]
then
export COVERAGE_FLAGS="${!COVERAGE_FLAGS_VAR}"
fi