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/timw/disable-broker-tests'

Browse source 
* origin/topic/timw/disable-broker-tests:
  Disable broker tests from building on the CI
  Disable broker documentation examples if disabling broker tests
This commit is contained in:
Jon Siwek 2020-05-13 11:16:05 -07:00
commit c55bbcfcda
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -3,8 +3,8 @@ btest_jobs: &BTEST_JOBS 8
btest_retries: &BTEST_RETRIES 2 btest_retries: &BTEST_RETRIES 2
memory: &MEMORY 6GB memory: &MEMORY 6GB
config: &CONFIG --build-type=release --enable-cpp-tests config: &CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests
memcheck_config: &MEMCHECK_CONFIG --build-type=debug --enable-cpp-tests --sanitizers=address --enable-fuzzers memcheck_config: &MEMCHECK_CONFIG --build-type=debug --enable-cpp-tests --disable-broker-tests --sanitizers=address --enable-fuzzers
resources_template: &RESOURCES_TEMPLATE resources_template: &RESOURCES_TEMPLATE
cpu: *CPUS cpu: *CPUS

8
CHANGES
View file

@ -1,4 +1,12 @@
3.2.0-dev.508 | 2020-05-13 11:16:05 -0700
* Disable broker tests from building on the CI (Tim Wojtulewicz, Corelight)
This results in a ~10% reduction in build time.
* Disable broker documentation examples if disabling broker tests (Tim Wojtulewicz, Corelight)
3.2.0-dev.505 | 2020-05-12 18:52:19 -0700 3.2.0-dev.505 | 2020-05-12 18:52:19 -0700
* Use zeek::detail namespace for fuzzer utils (Jon Siwek, Corelight) * Use zeek::detail namespace for fuzzer utils (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.505 3.2.0-dev.508

2
aux/broker

@ -1 +1 @@
Subproject commit 8b2c9a9e1e67d145af442fa2175dcb18b643a317 Subproject commit 70fa315e8b777056073a9e67f42b99573ef18231

1
configure vendored
View file

@ -272,6 +272,7 @@ while [ $# -ne 0 ]; do
;; ;;
--disable-broker-tests) --disable-broker-tests)
append_cache_entry BROKER_DISABLE_TESTS BOOL true append_cache_entry BROKER_DISABLE_TESTS BOOL true
append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true
;; ;;
--with-openssl=*) --with-openssl=*)
append_cache_entry OPENSSL_ROOT_DIR PATH $optarg append_cache_entry OPENSSL_ROOT_DIR PATH $optarg