diff --git a/testing/btest/Baseline/scripts.base.protocols.quic.interop.quic-go_quic-go.retry/conn.log.cut b/testing/btest/Baseline/scripts.base.protocols.quic.interop.quic-go_quic-go.retry/conn.log.cut index bb59162bc7..f60a9d33e6 100644 --- a/testing/btest/Baseline/scripts.base.protocols.quic.interop.quic-go_quic-go.retry/conn.log.cut +++ b/testing/btest/Baseline/scripts.base.protocols.quic.interop.quic-go_quic-go.retry/conn.log.cut @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ts uid history service -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 - - +0.000000 CHhAvVGS1DHFjwGM9 - - 0.016059 ClEkJM2Vm5giqnMf4h - - 0.669020 C4J4Th3PJpwUYZZ6gc Dd quic,ssl diff --git a/testing/btest/scripts/base/protocols/quic/chromium.zeek b/testing/btest/scripts/base/protocols/quic/chromium.zeek index 32b57ba157..bf3a35aa62 100644 --- a/testing/btest/scripts/base/protocols/quic/chromium.zeek +++ b/testing/btest/scripts/base/protocols/quic/chromium.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Test that runs the pcap + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-api-cirrus-com.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/curl-http3.zeek b/testing/btest/scripts/base/protocols/quic/curl-http3.zeek index 96d12eac6d..0c756fd14b 100644 --- a/testing/btest/scripts/base/protocols/quic/curl-http3.zeek +++ b/testing/btest/scripts/base/protocols/quic/curl-http3.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Test that runs the pcap + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/curl-8.1.2-dev-http3-www-google-de.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/events.zeek b/testing/btest/scripts/base/protocols/quic/events.zeek index 79759fc219..5810ce5127 100644 --- a/testing/btest/scripts/base/protocols/quic/events.zeek +++ b/testing/btest/scripts/base/protocols/quic/events.zeek @@ -1,5 +1,6 @@ # @TEST-DOC: Supported events so far. -# @TEST-REQUIRES: zeek -b -e 'print PacketAnalyzer::ANALYZER_PPP == PacketAnalyzer::ANALYZER_PPP' + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic %INPUT >out # @TEST-EXEC: echo "zerortt.pcap" >>out # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic %INPUT >>out diff --git a/testing/btest/scripts/base/protocols/quic/firefox.zeek b/testing/btest/scripts/base/protocols/quic/firefox.zeek index b59094d02d..04c5231aef 100644 --- a/testing/btest/scripts/base/protocols/quic/firefox.zeek +++ b/testing/btest/scripts/base/protocols/quic/firefox.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Test that runs the pcap + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/firefox-102.13.0esr-blog-cloudflare-com.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek b/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek index 98e5efb438..fdde1bb40d 100644 --- a/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek +++ b/testing/btest/scripts/base/protocols/quic/fragmented-crypto.zeek @@ -1,5 +1,6 @@ # @TEST-DOC: Pcap with fragmented and unordered CRYPTO frames. -# + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek index 00b646ff73..6ab93bd949 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/handshake.zeek @@ -1,8 +1,6 @@ # @TEST-DOC: Test interop pcap containing RETRY packet from server side. -# -# interop pcaps have link type DLT_PPP, test for its availability. Available in Zeek 6.1 or later only. -# @TEST-REQUIRES: zeek -b -e 'print PacketAnalyzer::ANALYZER_PPP == PacketAnalyzer::ANALYZER_PPP' -# + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/handshake.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek index 78b35b075f..cda59adf6e 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/retry.zeek @@ -1,8 +1,6 @@ # @TEST-DOC: Test interop pcap containing RETRY packet from server side. # -# interop pcaps have link type DLT_PPP, test for its availability. Available in Zeek 6.1 or later only. -# @TEST-REQUIRES: zeek -b -e 'print PacketAnalyzer::ANALYZER_PPP == PacketAnalyzer::ANALYZER_PPP' -# +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/retry.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek index 213b926100..05e282ae63 100644 --- a/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek +++ b/testing/btest/scripts/base/protocols/quic/interop/quic-go_quic-go/zerortt.zeek @@ -1,8 +1,6 @@ # @TEST-DOC: Test that client initiating connection using 0RTT packet doesn't cause analyzer errors trying to decrypt server side. # -# interop pcaps have link type DLT_PPP, test for its availability. Available in Zeek 6.1 or later only. -# @TEST-REQUIRES: zeek -b -e 'print PacketAnalyzer::ANALYZER_PPP == PacketAnalyzer::ANALYZER_PPP' -# +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/interop/quic-go_quic-go/zerortt.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/quic-log.zeek b/testing/btest/scripts/base/protocols/quic/quic-log.zeek index 4e720ed71a..f44b64ee86 100644 --- a/testing/btest/scripts/base/protocols/quic/quic-log.zeek +++ b/testing/btest/scripts/base/protocols/quic/quic-log.zeek @@ -1,5 +1,6 @@ # @TEST-DOC: Smoke test the quic.log production -# + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/chromium-115.0.5790.110-google-de-fragmented.pcap base/protocols/quic # @TEST-EXEC: btest-diff quic.log # @TEST-EXEC: btest-diff .stderr diff --git a/testing/btest/scripts/base/protocols/quic/quicdoq.zeek b/testing/btest/scripts/base/protocols/quic/quicdoq.zeek index c60cbf78e1..6b59766b31 100644 --- a/testing/btest/scripts/base/protocols/quic/quicdoq.zeek +++ b/testing/btest/scripts/base/protocols/quic/quicdoq.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Pcap with dns-over-quic lookup using https://github.com/private-octopus/quicdoq + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/quicdoq.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/run-pcap.zeek b/testing/btest/scripts/base/protocols/quic/run-pcap.zeek index 46d00d88b2..1e65d099d5 100644 --- a/testing/btest/scripts/base/protocols/quic/run-pcap.zeek +++ b/testing/btest/scripts/base/protocols/quic/run-pcap.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Test that runs the pcap + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/quic_win11_firefox_google.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: btest-diff conn.log.cut diff --git a/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek b/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek index 24153e5db2..1cbc2a0590 100644 --- a/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek +++ b/testing/btest/scripts/base/protocols/quic/vector-max-size-crash.zeek @@ -1,4 +1,6 @@ # @TEST-DOC: Test that runs the pcap + +# @TEST-REQUIRES: ${SCRIPTS}/have-quic # @TEST-EXEC: zeek -Cr $TRACES/quic/vector-max-size-crash.pcap base/protocols/quic # @TEST-EXEC: zeek-cut -m ts uid history service < conn.log > conn.log.cut # @TEST-EXEC: zeek-cut -m ts uid cause analyzer_kind analyzer_name failure_reason < analyzer.log > analyzer.log.cut diff --git a/testing/scripts/have-quic b/testing/scripts/have-quic new file mode 100755 index 0000000000..2969280170 --- /dev/null +++ b/testing/scripts/have-quic @@ -0,0 +1,7 @@ +#!/bin/sh + +if grep -q "ZEEK_HAVE_ANALYZER_QUIC:INTERNAL=yes" "${BUILD}"/CMakeCache.txt; then + exit 0 +fi + +exit 1