Merge remote-tracking branch 'origin/topic/johanna/jq-guard'

* origin/topic/johanna/jq-guard:
  Add TEST-REQUIRES: which jq to two new tests that are using jq

CHANGES

@@ -1,3 +1,11 @@
+7.1.0-dev.639 | 2024-11-27 12:31:40 -0700
+
+  * Add TEST-REQUIRES: which jq to two new tests that are using jq (Johanna Amann, Corelight)
+
+  * Explain why modbus test does not work with the Spicy SSL analyzer (Johanna Amann, Corelight)
+
+    This took a _long_ time to figure out.
+
 7.1.0-dev.635 | 2024-11-27 08:29:19 +0000
 
   * Support setting the synchronous flag and the journal_mode for the SQLite log writer.

VERSION

@@ -1 +1 @@
-7.1.0-dev.635
+7.1.0-dev.639

testing/btest/scripts/policy/protocols/conn/disable-unknown-ip-proto-support.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: which jq
 # @TEST-DOC: Test the policy for removing the unknown IP protocol field and connections from conn.log
 # @TEST-EXEC: zeek -r $TRACES/cisco-fabric-path.pcap %INPUT
 # @TEST-EXEC: test $(head -1 conn.log | jq 'has("ip_proto")') = "false"

testing/btest/scripts/policy/protocols/conn/ip-proto-name-logging.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: which jq
 # @TEST-DOC: Tests the ip-proto-name-logging policy file
 # @TEST-EXEC: zeek -r $TRACES/cisco-fabric-path.pcap %INPUT > out