Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/awelzel/auto-hilti-cxx-compiler-launcher-in-btest'

Browse source 
* origin/topic/awelzel/auto-hilti-cxx-compiler-launcher-in-btest:
  btest.cfg: Set HILTI_CXX_COMPILER_LAUNCHER based on build/CMakeCache.txt
This commit is contained in:
Tim Wojtulewicz 2023-05-25 09:03:40 -07:00
commit 2bf0ebae32
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CHANGES
View file

@ -1,3 +1,15 @@
6.0.0-dev.643 | 2023-05-25 09:03:40 -0700
* btest.cfg: Set HILTI_CXX_COMPILER_LAUNCHER based on build/CMakeCache.txt (Arne Welzel, Corelight)
If CMakeCache.txt indicates the Zeek build was done with ccache,
take the CCACHE_PROGRAM:FILEPATH= line and populate the
HILTI_CXX_COMPILER_LAUNCHER environment.
For local development with ccache, this speeds up the spicy tests
significantly after the initial run without knowing or needing know
that setting HILTI_CXX_COMPILER_LAUNCHER would've helped.
6.0.0-dev.641 | 2023-05-25 09:03:08 -0700 6.0.0-dev.641 | 2023-05-25 09:03:08 -0700
* Speed up Spicy-related tests. (Benjamin Bannier, Corelight) * Speed up Spicy-related tests. (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.641 6.0.0-dev.643

1
testing/btest/btest.cfg
View file

@ -13,6 +13,7 @@ MinVersion = 0.63
[environment] [environment]
ZEEKPATH=`bash -c %(testbase)s/../../%(build_dir)s/zeek-path-dev` ZEEKPATH=`bash -c %(testbase)s/../../%(build_dir)s/zeek-path-dev`
HILTI_CXX_COMPILER_LAUNCHER=`f=%(testbase)s/../../%(build_dir)s/CMakeCache.txt && grep -q '^ENABLE_CCACHE:BOOL=true' $f && sed -n 's/^CCACHE_PROGRAM:FILEPATH=\(.*\)$/\1/p' $f`
ZEEK_SEED_FILE=%(testbase)s/random.seed ZEEK_SEED_FILE=%(testbase)s/random.seed
ZEEK_PLUGIN_PATH= ZEEK_PLUGIN_PATH=
TZ=UTC TZ=UTC