Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/topic/awelzel/fix-btest-spicy-replaces-conflicts'

Browse source 
* upstream/topic/awelzel/fix-btest-spicy-replaces-conflicts:
  btest/spicy: Make replaces-conflicts trigger replaces code path
This commit is contained in:
Arne Welzel 2024-08-06 12:03:18 +02:00
commit bd8c5b7bbb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/btest/Baseline/spicy.replaces-conflicts/output
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### 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

2
testing/btest/spicy/replaces-conflicts.evt
View file

@ -16,7 +16,7 @@ protocol analyzer spicy::SSH_1 over TCP:
parse with SSH::Banner, parse with SSH::Banner,
replaces SSH; replaces SSH;
protocol analyzer spicy::SSH_1 over UDP: protocol analyzer spicy::SSH_2 over UDP:
parse with SSH::Banner, parse with SSH::Banner,
replaces SSH; replaces SSH;