From 7449b050b3341e56b0c2365b7528bebc52060d7e Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 10 Dec 2024 19:51:45 +0100
Subject: [PATCH] Update BiF-tracking, add get_current_packet_ts()

Also, run the ZAM-bif-tracking test in non-ZAM environments so
failures are caught immediately. There's nothing overly ZAM specific about
running this test.

I'm not sure I like the fact that any new contributor adding a BiF
will need to dig into this... it might be a bit intimidating.
---
 src/script_opt/FuncInfo.cc                                    | 1 +
 .../{Baseline.zam => Baseline}/opt.ZAM-bif-tracking/output    | 2 +-
 testing/btest/opt/ZAM-bif-tracking.zeek                       | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename testing/btest/{Baseline.zam => Baseline}/opt.ZAM-bif-tracking/output (70%)

diff --git a/src/script_opt/FuncInfo.cc b/src/script_opt/FuncInfo.cc
index 545f278f96..c21586f406 100644
--- a/src/script_opt/FuncInfo.cc
+++ b/src/script_opt/FuncInfo.cc
@@ -268,6 +268,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
     {"get_current_conn_packets_threshold", ATTR_NO_ZEEK_SIDE_EFFECTS},
     {"get_current_packet", ATTR_NO_ZEEK_SIDE_EFFECTS},
     {"get_current_packet_header", ATTR_NO_ZEEK_SIDE_EFFECTS},
+    {"get_current_packet_ts", ATTR_NO_ZEEK_SIDE_EFFECTS},
     {"get_dns_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
     {"get_event_handler_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
     {"get_event_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
diff --git a/testing/btest/Baseline.zam/opt.ZAM-bif-tracking/output b/testing/btest/Baseline/opt.ZAM-bif-tracking/output
similarity index 70%
rename from testing/btest/Baseline.zam/opt.ZAM-bif-tracking/output
rename to testing/btest/Baseline/opt.ZAM-bif-tracking/output
index 0138aa7bfe..d17a83be72 100644
--- a/testing/btest/Baseline.zam/opt.ZAM-bif-tracking/output
+++ b/testing/btest/Baseline/opt.ZAM-bif-tracking/output
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-540 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()
+541 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()
diff --git a/testing/btest/opt/ZAM-bif-tracking.zeek b/testing/btest/opt/ZAM-bif-tracking.zeek
index e059f1f839..e886fb1ce0 100644
--- a/testing/btest/opt/ZAM-bif-tracking.zeek
+++ b/testing/btest/opt/ZAM-bif-tracking.zeek
@@ -1,5 +1,6 @@
 # @TEST-DOC: ZAM maintenance script for tracking changes in BiFs.
-# @TEST-REQUIRES: test "${ZEEK_ZAM}" = "1"
+#
+# @TEST-REQUIRES: have-spicy
 #
 # @TEST-EXEC: zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
@@ -299,6 +300,7 @@ global known_BiFs = set(
 	"get_current_conn_packets_threshold",
 	"get_current_packet",
 	"get_current_packet_header",
+	"get_current_packet_ts",
 	"get_dns_stats",
 	"get_event_handler_stats",
 	"get_event_stats",