Merge remote-tracking branch 'origin/topic/timw/test-disabling-profiling'

* origin/topic/timw/test-disabling-profiling:
  Disable script profiling/coverage on sanitizer builds

.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

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
 

VERSION

@@ -1 +1 @@
-4.2.0-dev.194
+4.2.0-dev.196

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