From 2d93a19f4595b1e8c623b2e42813d50767de1148 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Thu, 14 Apr 2022 15:20:08 -0700
Subject: [PATCH] Expand plugin.reporter-hook testcase to verify -NN output

---
 .../Baseline/plugins.reporter-hook/output     | 23 +++++++++++--------
 .../plugins.reporter-hook/reporter.log        |  8 +++----
 testing/btest/plugins/reporter-hook.zeek      |  3 ++-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/testing/btest/Baseline/plugins.reporter-hook/output b/testing/btest/Baseline/plugins.reporter-hook/output
index bcc9b6a25a..57b265589c 100644
--- a/testing/btest/Baseline/plugins.reporter-hook/output
+++ b/testing/btest/Baseline/plugins.reporter-hook/output
@@ -1,11 +1,14 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
- | Hook  Some Info <...>/reporter-hook.zeek, line 16
- | Hook error An Error <...>/reporter-hook.zeek, line 18
- | Hook error An Error that does not show up in the log <...>/reporter-hook.zeek, line 19
- | Hook expression error field value missing (b$a) <...>/reporter-hook.zeek, line 23
- | Hook warning A warning <...>/reporter-hook.zeek, line 17
-<...>/reporter-hook.zeek, line 16: Some Info
-error in <...>/reporter-hook.zeek, line 18: An Error
-error in <...>/reporter-hook.zeek, line 19: An Error that does not show up in the log
-expression error in <...>/reporter-hook.zeek, line 23: field value missing (b$a)
-warning in <...>/reporter-hook.zeek, line 17: A warning
+Reporter::Hook - Exercise Reporter Hook (dynamic, version 1.0.0)
+    Implements Reporter (priority 0)
+
+ | Hook  Some Info <...>/reporter-hook.zeek, line 17
+ | Hook error An Error <...>/reporter-hook.zeek, line 19
+ | Hook error An Error that does not show up in the log <...>/reporter-hook.zeek, line 20
+ | Hook expression error field value missing (b$a) <...>/reporter-hook.zeek, line 24
+ | Hook warning A warning <...>/reporter-hook.zeek, line 18
+<...>/reporter-hook.zeek, line 17: Some Info
+error in <...>/reporter-hook.zeek, line 19: An Error
+error in <...>/reporter-hook.zeek, line 20: An Error that does not show up in the log
+expression error in <...>/reporter-hook.zeek, line 24: field value missing (b$a)
+warning in <...>/reporter-hook.zeek, line 18: A warning
diff --git a/testing/btest/Baseline/plugins.reporter-hook/reporter.log b/testing/btest/Baseline/plugins.reporter-hook/reporter.log
index 2b9dfb451d..1225fa1cfa 100644
--- a/testing/btest/Baseline/plugins.reporter-hook/reporter.log
+++ b/testing/btest/Baseline/plugins.reporter-hook/reporter.log
@@ -7,8 +7,8 @@
 #open XXXX-XX-XX-XX-XX-XX
 #fields	ts	level	message	location
 #types	time	enum	string	string
-XXXXXXXXXX.XXXXXX	Reporter::INFO	Some Info	<...>/reporter-hook.zeek, line 16
-XXXXXXXXXX.XXXXXX	Reporter::WARNING	A warning	<...>/reporter-hook.zeek, line 17
-XXXXXXXXXX.XXXXXX	Reporter::ERROR	An Error	<...>/reporter-hook.zeek, line 18
-XXXXXXXXXX.XXXXXX	Reporter::ERROR	field value missing (b$a)	<...>/reporter-hook.zeek, line 23
+XXXXXXXXXX.XXXXXX	Reporter::INFO	Some Info	<...>/reporter-hook.zeek, line 17
+XXXXXXXXXX.XXXXXX	Reporter::WARNING	A warning	<...>/reporter-hook.zeek, line 18
+XXXXXXXXXX.XXXXXX	Reporter::ERROR	An Error	<...>/reporter-hook.zeek, line 19
+XXXXXXXXXX.XXXXXX	Reporter::ERROR	field value missing (b$a)	<...>/reporter-hook.zeek, line 24
 #close XXXX-XX-XX-XX-XX-XX
diff --git a/testing/btest/plugins/reporter-hook.zeek b/testing/btest/plugins/reporter-hook.zeek
index 92a971eca8..4407a1013f 100644
--- a/testing/btest/plugins/reporter-hook.zeek
+++ b/testing/btest/plugins/reporter-hook.zeek
@@ -1,7 +1,8 @@
 # @TEST-EXEC: ${DIST}/auxil/zeek-aux/plugin-support/init-plugin -u . Reporter Hook
 # @TEST-EXEC: cp -r %DIR/reporter-hook-plugin/* .
 # @TEST-EXEC: ./configure --zeek-dist=${DIST} && make
-# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
+# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -NN Reporter::Hook >output
+# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >>output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log