Merge remote-tracking branch 'origin/topic/awelzel/test-init-hooks-plugin'

* origin/topic/awelzel/test-init-hooks-plugin:
  btest/plugins: Add a plugin testing Init and Done hooks

CHANGES

@@ -1,3 +1,7 @@
+7.1.0-dev.611 | 2024-11-22 18:37:37 +0100
+
+  * btest/plugins: Add a plugin testing Init and Done hooks (Arne Welzel, Corelight)
+
 7.1.0-dev.609 | 2024-11-22 15:29:29 +0100
 
   * GH-4052: Disable core.expr-execption btest under ZAM to fix CI builds (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-7.1.0-dev.609
+7.1.0-dev.611

testing/btest/Baseline/plugins.init-hooks/out

@@ -0,0 +1,8 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Configure()
+InitPreScript()
+InitPostScript()
+InitPreExecution()
+zeek_init
+zeek_done
+Done()

testing/btest/plugins/init-hooks-plugin/src/Plugin.cc

@@ -0,0 +1,28 @@
+#include "Plugin.h"
+
+#include <cstdio>
+namespace btest::plugin::Demo_InitHooks {
+Plugin plugin;
+}
+
+using namespace btest::plugin::Demo_InitHooks;
+
+zeek::plugin::Configuration Plugin::Configure() {
+    setlinebuf(stdout);
+    std::fprintf(stdout, "Configure()\n");
+    zeek::plugin::Configuration config;
+    config.name = "Demo::InitHooks";
+    config.description = "Test Init and Done hooks";
+    config.version.major = 1;
+    config.version.minor = 0;
+    config.version.patch = 0;
+    return config;
+}
+
+void Plugin::InitPreScript() { std::fprintf(stdout, "InitPreScript()\n"); }
+
+void Plugin::InitPostScript() { std::fprintf(stdout, "InitPostScript()\n"); }
+
+void Plugin::InitPreExecution() { std::fprintf(stdout, "InitPreExecution()\n"); }
+
+void Plugin::Done() { std::fprintf(stdout, "Done()\n"); }

testing/btest/plugins/init-hooks-plugin/src/Plugin.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <zeek/plugin/Plugin.h>
+#include <cstdio>
+
+namespace btest::plugin::Demo_InitHooks {
+
+
+class Plugin : public zeek::plugin::Plugin {
+protected:
+    zeek::plugin::Configuration Configure() override;
+    void InitPreScript() override;
+    void InitPostScript() override;
+    void InitPreExecution() override;
+    void Done() override;
+};
+
+extern Plugin plugin;
+} // namespace btest::plugin::Demo_InitHooks

testing/btest/plugins/init-hooks.zeek

@@ -0,0 +1,17 @@
+# @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Demo InitHooks
+# @TEST-EXEC: cp -r %DIR/init-hooks-plugin/* .
+
+# @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
+#
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT >out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff out
+
+@load-plugin Demo::InitHooks
+
+event zeek_init() {
+	print "zeek_init";
+}
+
+event zeek_done() {
+	print "zeek_done";
+}