diff --git a/.cirrus.yml b/.cirrus.yml index 184484b2e8..a4a6a48a54 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -271,4 +271,5 @@ sanitizer_task: CXXFLAGS: -DZEEK_DICT_DEBUG ZEEK_CI_CONFIGURE_FLAGS: *SANITIZER_CONFIG ZEEK_TAILORED_UB_CHECKS: 1 + ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 UBSAN_OPTIONS: print_stacktrace=1 diff --git a/CHANGES b/CHANGES index 83149f48dc..75c92b2952 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4.2.0-dev.196 | 2021-09-21 09:44:26 -0700 + + * Disable script profiling/coverage on sanitizer builds (Tim Wojtulewicz, Corelight) 4.2.0-dev.194 | 2021-09-21 17:56:14 +0200 diff --git a/VERSION b/VERSION index 6b60aec92f..b55e4f12a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.0-dev.194 +4.2.0-dev.196 diff --git a/ci/test.sh b/ci/test.sh index f6f0166e9a..50d0703dc9 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -60,6 +60,14 @@ function run_btests banner "Running baseline tests: zeek" pushd testing/btest + + # Commenting out this line in btest.cfg causes the script profiling/coverage + # to be disabled. We do this for the sanitizer build right now because of a + # fairly significant performance bug when running tests. + if [ "${ZEEK_CI_DISABLE_SCRIPT_PROFILING}" = "1" ]; then + sed -i 's/^ZEEK_PROFILER_FILE/#ZEEK_PROFILER_FILE/g' btest.cfg + fi + ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1 make coverage prep_artifacts @@ -69,6 +77,15 @@ function run_btests function run_external_btests { + # Commenting out this line in btest.cfg causes the script profiling/coverage + # to be disabled. We do this for the sanitizer build right now because of a + # fairly significant performance bug when running tests. + if [ "${ZEEK_CI_DISABLE_SCRIPT_PROFILING}" = "1" ]; then + pushd testing/external + sed -i 's/^ZEEK_PROFILER_FILE/#ZEEK_PROFILER_FILE/g' subdir-btest.cfg + popd + fi + local zeek_testing_pid="" local zeek_testing_pid_private="" pushd testing/external/zeek-testing