diff --git a/.cirrus.yml b/.cirrus.yml index e6c3caae35..54f0d56865 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -388,7 +388,6 @@ asan_sanitizer_task: env: CXXFLAGS: -DZEEK_DICT_DEBUG ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG - ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 ASAN_OPTIONS: detect_leaks=1 ubsan_sanitizer_task: @@ -403,7 +402,6 @@ ubsan_sanitizer_task: env: CXXFLAGS: -DZEEK_DICT_DEBUG ZEEK_CI_CONFIGURE_FLAGS: *UBSAN_SANITIZER_CONFIG - ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 ZEEK_TAILORED_UB_CHECKS: 1 UBSAN_OPTIONS: print_stacktrace=1 diff --git a/ci/test.sh b/ci/test.sh index b643293911..310212ab00 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -59,13 +59,6 @@ function run_btests { 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 -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1 make coverage prep_artifacts @@ -74,15 +67,6 @@ 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