Merge remote-tracking branch 'origin/topic/awelzel/asan-coverage-fixes'

* origin/topic/awelzel/asan-coverage-fixes:
  Bump cmake for -fprofile-update=atomic usage
  cirrus: Unset CCACHE_BASEDIR for asan/coverage build
This commit is contained in:
Arne Welzel 2024-06-11 11:00:46 +02:00
commit 3081a40a2a
4 changed files with 19 additions and 2 deletions

View file

@ -397,6 +397,8 @@ asan_sanitizer_task:
CXXFLAGS: -DZEEK_DICT_DEBUG CXXFLAGS: -DZEEK_DICT_DEBUG
ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG
ASAN_OPTIONS: detect_leaks=1:detect_odr_violation=0 ASAN_OPTIONS: detect_leaks=1:detect_odr_violation=0
# Use absolute paths for coverage files.
CCACHE_BASEDIR:
ubsan_sanitizer_task: ubsan_sanitizer_task:
container: container:

15
CHANGES
View file

@ -1,3 +1,18 @@
7.0.0-dev.376 | 2024-06-11 11:00:46 +0200
* Bump cmake for -fprofile-update=atomic usage (Arne Welzel, Corelight)
* cirrus: Unset CCACHE_BASEDIR for asan/coverage build (Arne Welzel, Corelight)
When CCACHE_BASEDIR is set, ccache will rewrite absolute paths to
relative paths in order to allow compilation in different source
directories. We do not need this feature on Cirrus (the checkout
is always in /zeek) and using absolute paths avoids
confusion/normalization needs for the gcov -p results.
We could consider removing the global CCACHE_BASEDIR, but it'd
bust the ccache of every other task, too.
7.0.0-dev.372 | 2024-06-07 09:28:52 -0700 7.0.0-dev.372 | 2024-06-07 09:28:52 -0700
* Add Telemetry::metrics_address option (Tim Wojtulewicz, Corelight) * Add Telemetry::metrics_address option (Tim Wojtulewicz, Corelight)

View file

@ -1 +1 @@
7.0.0-dev.372 7.0.0-dev.376

2
cmake

@ -1 +1 @@
Subproject commit aeca56db02ef5056ea880ec7fa94463841b4b535 Subproject commit 2df3b8e82a843b7b8187963d259d32a9fb42b873