Merge remote-tracking branch 'origin/topic/etyp/bg-test-nondeterminism'

* origin/topic/etyp/bg-test-nondeterminism:
  Fix input error test nondeterminism

CHANGES

@@ -1,3 +1,12 @@
+7.1.0-dev.377 | 2024-10-02 20:17:28 +0200
+
+  * Fix input error test nondeterminism (Evan Typanski, Corelight)
+
+    It seems like other similar tests get by because they have more "stuff"
+    before they call `terminate()` most likely. But, to be safe, just
+    removing the "received termination signal" line seems like the best
+    approach.
+
 7.1.0-dev.375 | 2024-10-01 11:40:16 +0200
 
   * Report suppressed warnings count (Evan Typanski, Corelight)

VERSION

@@ -1 +1 @@
-7.1.0-dev.375
+7.1.0-dev.377

testing/btest/Baseline/scripts.base.frameworks.input.invalid-lines-duplicate/.stderrwithoutfirstline

@@ -3,5 +3,4 @@ warning: ..<...>/Input::READER_ASCII: ../input.log, line 3: Not enough fields in
 warning: ..<...>/Input::READER_ASCII: ../input.log, line 9: Suppressed 5 warning(s)
 warning: ..<...>/Input::READER_ASCII: ../input.log, line 10: Not enough fields in line 'hello' of ../input.log. Found 0 fields, want positions 1 and -1
 warning: ..<...>/Input::READER_ASCII: ../input.log, line 16: Suppressed 6 warning(s)
-received termination signal
 >>>

testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek

@@ -1,6 +1,6 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
 # @TEST-EXEC: btest-bg-wait 10
-# @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline
+# @TEST-EXEC: sed -e 1d -e '/received termination/d' .stderr > .stderrwithoutfirstline
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline
 
 redef exit_only_after_terminate = T;
@@ -46,5 +46,5 @@ event zeek_init() {
 
 
 event Input::end_of_data(name: string, source:string) {
-	terminate();
+    terminate();
 }