From 13b0e7a2aa96af4d19810446869c85771cf1e9fb Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 1 Feb 2023 12:33:09 +0100 Subject: [PATCH] docker: Extend tests to run a very basic Zeek script Mostly because a `-v` shortcuts quite, while a zeek -e 'print zeek_version()' will also parse all base scripts, etc. --- docker/btest/Baseline/docker.structure_tests/output | 1 + docker/btest/docker/structure_tests.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docker/btest/Baseline/docker.structure_tests/output b/docker/btest/Baseline/docker.structure_tests/output index 0c8a07377a..9caa011cea 100644 --- a/docker/btest/Baseline/docker.structure_tests/output +++ b/docker/btest/Baseline/docker.structure_tests/output @@ -1,5 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. zeek version xxx +zeek version xxx XXX [sources] zeek = https://github.com/zeek/packages diff --git a/docker/btest/docker/structure_tests.sh b/docker/btest/docker/structure_tests.sh index 17a54aa86d..0a890a3488 100644 --- a/docker/btest/docker/structure_tests.sh +++ b/docker/btest/docker/structure_tests.sh @@ -7,6 +7,9 @@ TEST_TAG=${TEST_TAG:-zeek:latest} # Check that `zeek` can be run. docker run --rm "${TEST_TAG}" zeek -v | sed 's/\(zeek version\) .*/\1 xxx/' +# ...and load and execute some basic scripts, too. +docker run --rm "${TEST_TAG}" zeek -e 'print fmt("zeek version %s", zeek_version())' | sed 's/\(zeek version\) .*/\1 xxx/' + # Check that this is a release build. docker run --rm "${TEST_TAG}" zeek-config --build_type | grep -q 'release'