diff --git a/scripts/base/protocols/ldap/__load__.zeek b/scripts/base/protocols/ldap/__load__.zeek index 4f7f22c492..ab87986c63 100644 --- a/scripts/base/protocols/ldap/__load__.zeek +++ b/scripts/base/protocols/ldap/__load__.zeek @@ -1,2 +1,4 @@ +@if ( have_spicy_analyzers() ) @load-sigs ./dpd.sig @load ./main.zeek +@endif diff --git a/testing/btest/scripts/base/protocols/ldap/attributes.zeek b/testing/btest/scripts/base/protocols/ldap/attributes.zeek index bc482ebbfa..cc31bce939 100644 --- a/testing/btest/scripts/base/protocols/ldap/attributes.zeek +++ b/testing/btest/scripts/base/protocols/ldap/attributes.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -C -r ${TRACES}/ldap/simpleauth.pcap %INPUT # @TEST-EXEC: cat conn.log | zeek-cut -Cn local_orig local_resp > conn.log2 && mv conn.log2 conn.log # @TEST-EXEC: btest-diff conn.log diff --git a/testing/btest/scripts/base/protocols/ldap/availability.zeek b/testing/btest/scripts/base/protocols/ldap/availability.zeek index 44234ac15d..a24ff3f799 100644 --- a/testing/btest/scripts/base/protocols/ldap/availability.zeek +++ b/testing/btest/scripts/base/protocols/ldap/availability.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -NN | grep -q ANALYZER_LDAP_TCP # # @TEST-DOC: Check that LDAP (TCP) is analyzer is available. diff --git a/testing/btest/scripts/base/protocols/ldap/basic.zeek b/testing/btest/scripts/base/protocols/ldap/basic.zeek index b5753b1fea..62bd3d817d 100644 --- a/testing/btest/scripts/base/protocols/ldap/basic.zeek +++ b/testing/btest/scripts/base/protocols/ldap/basic.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -C -r ${TRACES}/ldap/simpleauth.pcap %INPUT >output 2>&1 # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat conn.log | zeek-cut -Cn local_orig local_resp > conn.log2 && mv conn.log2 conn.log diff --git a/testing/btest/scripts/base/protocols/ldap/diff_port.zeek b/testing/btest/scripts/base/protocols/ldap/diff_port.zeek index 565903355d..2f76163f1b 100644 --- a/testing/btest/scripts/base/protocols/ldap/diff_port.zeek +++ b/testing/btest/scripts/base/protocols/ldap/diff_port.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -C -r ${TRACES}/ldap/simpleauth-diff-port.pcap %INPUT # @TEST-EXEC: cat conn.log | zeek-cut -Cn local_orig local_resp > conn.log2 && mv conn.log2 conn.log # @TEST-EXEC: btest-diff conn.log diff --git a/testing/btest/scripts/base/protocols/ldap/functions.spicy b/testing/btest/scripts/base/protocols/ldap/functions.spicy index 4bcc721673..468e529f57 100644 --- a/testing/btest/scripts/base/protocols/ldap/functions.spicy +++ b/testing/btest/scripts/base/protocols/ldap/functions.spicy @@ -1,5 +1,5 @@ # This test can only run if we have the LDAP grammar available. -# @TEST-REQUIRES: [ -n ${DIST} ] +# @TEST-REQUIRES: have-spicy && [ -n ${DIST} ] # # @TEST-EXEC: spicyc -j -d -L ${DIST}/src/analyzer/protocol/ldap %INPUT # diff --git a/testing/btest/scripts/base/protocols/ldap/log_policy.zeek b/testing/btest/scripts/base/protocols/ldap/log_policy.zeek index 0317fc6a7d..6a9b0d6f14 100644 --- a/testing/btest/scripts/base/protocols/ldap/log_policy.zeek +++ b/testing/btest/scripts/base/protocols/ldap/log_policy.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -C -r ${TRACES}/ldap/simpleauth.pcap %INPUT >output 2>&1 # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat conn.log | zeek-cut -Cn local_orig local_resp > conn.log2 && mv conn.log2 conn.log diff --git a/testing/btest/scripts/base/protocols/ldap/sasl-encrypted.zeek b/testing/btest/scripts/base/protocols/ldap/sasl-encrypted.zeek index f84f979237..9e217bccb4 100644 --- a/testing/btest/scripts/base/protocols/ldap/sasl-encrypted.zeek +++ b/testing/btest/scripts/base/protocols/ldap/sasl-encrypted.zeek @@ -1,5 +1,6 @@ # Copyright (c) 2021 by the Zeek Project. See LICENSE for details. +# @TEST-REQUIRES: have-spicy # @TEST-EXEC: zeek -C -r ${TRACES}/ldap/krb5-sign-seal-01.pcap %INPUT # @TEST-EXEC: cat conn.log | zeek-cut -Cn local_orig local_resp > conn.log2 && mv conn.log2 conn.log # @TEST-EXEC: btest-diff conn.log