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

ci/btest: Remove ZEEK_PROFILER_FILE from btest.cfg, set in ci/test.sh explicitly

Browse source 
The produced coverage files are of little use in current local workflows
and usually just end-up taking up disk space. ZEEK_PROFILER_FILE can be
set explicitly if there's a one-off need to produce these locally, too.
This commit is contained in:
Arne Welzel 2023-12-15 15:20:30 +01:00
parent 344369f169
commit 43fec1f2c8
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ci/test.sh
View file

@ -59,6 +59,7 @@ function run_btests {
pushd testing/btest pushd testing/btest
ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1 ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
make coverage make coverage
prep_artifacts prep_artifacts
@ -70,6 +71,7 @@ function run_external_btests {
local zeek_testing_pid="" local zeek_testing_pid=""
local zeek_testing_pid_private="" local zeek_testing_pid_private=""
pushd testing/external/zeek-testing pushd testing/external/zeek-testing
ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
${BTEST} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 & ${BTEST} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 &
zeek_testing_pid=$! zeek_testing_pid=$!
popd popd
@ -78,6 +80,7 @@ function run_external_btests {
pushd testing/external/zeek-testing-private pushd testing/external/zeek-testing-private
# Note that we don't use btest's "-d" flag or generate/upload any # Note that we don't use btest's "-d" flag or generate/upload any
# artifacts to prevent leaking information about the private pcaps. # artifacts to prevent leaking information about the private pcaps.
ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
${BTEST} -A -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 & ${BTEST} -A -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 &
zeek_testing_private_pid=$! zeek_testing_private_pid=$!
popd popd

1
testing/btest/btest.cfg
View file

@ -28,7 +28,6 @@ DIST=%(testbase)s/../..
BUILD=%(testbase)s/../../%(build_dir)s BUILD=%(testbase)s/../../%(build_dir)s
TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier
TMPDIR=%(testbase)s/.tmp TMPDIR=%(testbase)s/.tmp
ZEEK_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
BTEST_RST_FILTER=$SCRIPTS/rst-filter BTEST_RST_FILTER=$SCRIPTS/rst-filter
ZEEK_DNS_FAKE=1 ZEEK_DNS_FAKE=1
ZEEK_DEFAULT_LISTEN_ADDRESS=127.0.0.1 ZEEK_DEFAULT_LISTEN_ADDRESS=127.0.0.1

1
testing/external/subdir-btest.cfg vendored
View file

@ -22,7 +22,6 @@ SCRIPTS=%(testbase)s/../scripts
SCRIPTS_LOCAL=%(testbase)s/scripts SCRIPTS_LOCAL=%(testbase)s/scripts
DIST=%(testbase)s/../../.. DIST=%(testbase)s/../../..
BUILD=%(testbase)s/../../../%(build_dir)s BUILD=%(testbase)s/../../../%(build_dir)s
ZEEK_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
ZEEK_DNS_FAKE=1 ZEEK_DNS_FAKE=1
# Fedora/CentOS/RedHat have MD5 disabled for certificate verification and need setting an environment variable to permit it: # Fedora/CentOS/RedHat have MD5 disabled for certificate verification and need setting an environment variable to permit it:
OPENSSL_ENABLE_MD5_VERIFY=1 OPENSSL_ENABLE_MD5_VERIFY=1