diff --git a/CHANGES b/CHANGES index a13885d5d2..519260c1ee 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Use ensurepip to install pip on FreeBSD (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 5657743aad..1520bcf1d9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.98 +6.0.0-dev.100 diff --git a/ci/test.sh b/ci/test.sh index ebedf019e3..b643293911 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -66,7 +66,7 @@ function run_btests { 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 + ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1 make coverage prep_artifacts popd @@ -86,7 +86,7 @@ function run_external_btests { local zeek_testing_pid="" local zeek_testing_pid_private="" 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=$! popd @@ -94,7 +94,7 @@ function run_external_btests { pushd testing/external/zeek-testing-private # Note that we don't use btest's "-d" flag or generate/upload any # 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=$! popd fi