diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-03-09 10:11:25 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-03-11 17:35:49 +0000 |
| commit | e39b9a2f805bc3522f41deb99840433c97276bfe (patch) | |
| tree | 7f66b1c0aee418684cc6b5da9846dfa79c07395e | |
| parent | 3bfc864c72366ff3ecb8fd3c03b73eed2abd9eb2 (diff) | |
CMake: Disable fuzzshark by default.
Most people don't use fuzzshark, so don't waste compute resources
building it. OSS-Fuzz has been updated to always build fuzzshark in
https://github.com/google/oss-fuzz/pull/7373
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | CMakeOptions.txt | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73b091eb02..1686671de6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -582,7 +582,8 @@ Code Checks + Clang Warnings: - ./tools/check_tfs.py --commits $NUM_COMMITS | tee tfs_check.txt - cd build - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)" - - cmake -DENABLE_EXTRA_COMPILER_WARNINGS=on -DENABLE_CHECKHF_CONFLICT=on -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DENABLE_CCACHE=ON -G Ninja .. + # We don't have an "All options" job, so build fuzzshark here. + - cmake -DENABLE_EXTRA_COMPILER_WARNINGS=on -DENABLE_CHECKHF_CONFLICT=on -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DBUILD_fuzzshark=ON -DENABLE_CCACHE=ON -G Ninja .. - printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)" - mkdir ../html - script --command ninja --flush --quiet --return ../tmp_clang_report.txt diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 81fc8f4d44..e130951bc9 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -42,12 +42,8 @@ endif() option(BUILD_udpdump "Build udpdump" ON) option(BUILD_sharkd "Build sharkd" ON) -if(WIN32) - option(BUILD_fuzzshark "Build fuzzshark" OFF) -else() - option(BUILD_fuzzshark "Build fuzzshark" ON) -endif() option(BUILD_mmdbresolve "Build MaxMind DB resolver" ON) +option(BUILD_fuzzshark "Build fuzzshark" OFF) option(ENABLE_WERROR "Treat warnings as errors" ON) option(ENABLE_DEBUG "Enable debug code" ON) |