diff options
| author |  Max Moroz <dor3s1@gmail.com> | 2017-10-20 17:15:02 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-20 17:15:02 -0700 |
| commit | 63a6cb31b4cee05af85b86433ca08caee972f622 (patch) | |
| tree | 002a3323671f58ae0d707184287622f89b66dc8d | |
| parent | 019ef35f1ad68eed5e38b67ed31292049f59a319 (diff) | |
[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).
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 2 | ||||
| -rwxr-xr-x | infra/base-images/base-builder/compile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 313bf850..356e94e9 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -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" diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index 08981315..434f526f 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -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 |