From bae15230bb9137e5485d8a70539f1494b7cf502e Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 6 Aug 2024 11:45:41 +0200
Subject: [PATCH] btest/spicy: Make replaces-conflicts trigger replaces code
 path

The current test attempts to instantiate two spicy::SSH_1 protocol
analyzers in the .evt file. The intention likely was to use two
distinct protocol analyzer both trying to replace the builtin SSH
analyzer.

Coincidentally, fixing this happens to workaround TSAN errors tickled
by the FatalError() call while loading the .hlto with two identically
named analyzers.

    $ cat .tmp/spicy.replaces-conflicts/output
    error: redefinition of protocol analyzer spicy::SSH_1
    ThreadSanitizer: main thread finished with ignores enabled
      One of the following ignores was not ended (in order of probability)
      Ignore was enabled at:
        #0 __llvm_gcov_init __linker___d192e45c25d5ee23-484d3e0fc2caf5b4.cc (ssh.hlto+0x34036) (BuildId: 091934ca4da885e7)
        #1 __llvm_gcov_init __linker___d192e45c25d5ee23-484d3e0fc2caf5b4.cc (ssh.hlto+0x34036) (BuildId: 091934ca4da885e7)
        ...

I was tempted to replace FatalError() with Error() and rely on
zeek-setup.cc's early exiting on any reporter errors, but this
seems easier for now.

Relates to #3865.
---
 testing/btest/Baseline/spicy.replaces-conflicts/output | 2 +-
 testing/btest/spicy/replaces-conflicts.evt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/btest/Baseline/spicy.replaces-conflicts/output b/testing/btest/Baseline/spicy.replaces-conflicts/output
index 8cf95b5195..e5e9334522 100644
--- a/testing/btest/Baseline/spicy.replaces-conflicts/output
+++ b/testing/btest/Baseline/spicy.replaces-conflicts/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.
-fatal error: redefinition of protocol analyzer spicy::SSH_1
+fatal error: spicy::SSH_2: protocol analyzer SSH is already mapped to a different analyzer; cannot replace an analyzer multiple times
diff --git a/testing/btest/spicy/replaces-conflicts.evt b/testing/btest/spicy/replaces-conflicts.evt
index dbca6d637e..5ca7610503 100644
--- a/testing/btest/spicy/replaces-conflicts.evt
+++ b/testing/btest/spicy/replaces-conflicts.evt
@@ -16,7 +16,7 @@ protocol analyzer spicy::SSH_1 over TCP:
     parse with SSH::Banner,
     replaces SSH;
 
-protocol analyzer spicy::SSH_1 over UDP:
+protocol analyzer spicy::SSH_2 over UDP:
     parse with SSH::Banner,
     replaces SSH;