Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/btest-dash-a'

Browse source 
* origin/topic/timw/btest-dash-a:
  Use btest -A on CI to get more information about stuck tests
This commit is contained in:
Tim Wojtulewicz 2023-02-22 17:05:56 -07:00
commit 1a1cf8576e
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.100 | 2023-02-22 17:05:56 -0700
* Use btest -A on CI to get more information about stuck tests (Tim Wojtulewicz, Corelight)
6.0.0-dev.98 | 2023-02-22 15:53:12 -0700 6.0.0-dev.98 | 2023-02-22 15:53:12 -0700
* Use ensurepip to install pip on FreeBSD (Tim Wojtulewicz, Corelight) * Use ensurepip to install pip on FreeBSD (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.98 6.0.0-dev.100

6
ci/test.sh
View file

@ -66,7 +66,7 @@ function run_btests {
sed -i 's/^ZEEK_PROFILER_FILE/#ZEEK_PROFILER_FILE/g' btest.cfg sed -i 's/^ZEEK_PROFILER_FILE/#ZEEK_PROFILER_FILE/g' btest.cfg
fi fi
${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -b -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
popd popd
@ -86,7 +86,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
${BTEST} -d -b -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
@ -94,7 +94,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.
${BTEST} -b -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
fi fi