From 9a4de4e9fc087203316466f2aa12077ca22af982 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 23 Nov 2023 17:17:48 +0000 Subject: [PATCH] Spicy: allow providing file id in zeek::file_begin Minor update of testcase --- .../btest/Baseline/spicy.file-analysis-data-in/output-1 | 3 +++ .../spicy.file-analysis-data-in/{output => output-2} | 2 -- testing/btest/spicy/file-analysis-data-in.zeek | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 testing/btest/Baseline/spicy.file-analysis-data-in/output-1 rename testing/btest/Baseline/spicy.file-analysis-data-in/{output => output-2} (80%) diff --git a/testing/btest/Baseline/spicy.file-analysis-data-in/output-1 b/testing/btest/Baseline/spicy.file-analysis-data-in/output-1 new file mode 100644 index 0000000000..8a97453dba --- /dev/null +++ b/testing/btest/Baseline/spicy.file-analysis-data-in/output-1 @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +FM47gX3vI5ofQPm1li +FZjUS57tUkGFTibv3 diff --git a/testing/btest/Baseline/spicy.file-analysis-data-in/output b/testing/btest/Baseline/spicy.file-analysis-data-in/output-2 similarity index 80% rename from testing/btest/Baseline/spicy.file-analysis-data-in/output rename to testing/btest/Baseline/spicy.file-analysis-data-in/output-2 index 083ef44731..a1b10d3fd2 100644 --- a/testing/btest/Baseline/spicy.file-analysis-data-in/output +++ b/testing/btest/Baseline/spicy.file-analysis-data-in/output-2 @@ -1,5 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -FM47gX3vI5ofQPm1li -FZjUS57tUkGFTibv3 FaAaAaAaAaAaAaAaAa FaAaAaAaAaAaAaAaAa diff --git a/testing/btest/spicy/file-analysis-data-in.zeek b/testing/btest/spicy/file-analysis-data-in.zeek index 4ca12d48c9..c2c2e9622f 100644 --- a/testing/btest/spicy/file-analysis-data-in.zeek +++ b/testing/btest/spicy/file-analysis-data-in.zeek @@ -2,7 +2,7 @@ # # @TEST-EXEC: cat ssh.spicy ssh-1.spicy > ssh-test.spicy # @TEST-EXEC: spicyz -d -o test.hlto ssh-test.spicy ./ssh-cond.evt -# @TEST-EXEC: zeek -r ${TRACES}/ssh/single-conn.trace test.hlto %INPUT Spicy::enable_print=T | sort >output +# @TEST-EXEC: zeek -r ${TRACES}/ssh/single-conn.trace test.hlto %INPUT Spicy::enable_print=T | sort >output-1 # # @TEST-EXEC: cat x509.log | grep -v ^# | cut -f 4-5 >x509.log.tmp && mv x509.log.tmp x509.log # @TEST-EXEC: btest-diff x509.log @@ -12,12 +12,13 @@ # # @TEST-EXEC: cat ssh.spicy ssh-2.spicy > ssh-test.spicy # @TEST-EXEC: spicyz -d -o test.hlto ssh-test.spicy ./ssh-cond.evt -# @TEST-EXEC: zeek -r ${TRACES}/ssh/single-conn.trace test.hlto %INPUT Spicy::enable_print=T | sort >>output +# @TEST-EXEC: zeek -r ${TRACES}/ssh/single-conn.trace test.hlto %INPUT Spicy::enable_print=T | sort >output-2 # # @TEST-EXEC: cat files.log | zeek-cut fuid filename >files.log.tmp && mv files.log.tmp files-2.log # @TEST-EXEC: btest-diff files-2.log # -# @TEST-EXEC: TEST_DIFF_CANONIFIER=diff-canonifier-spicy btest-diff output +# @TEST-EXEC: TEST_DIFF_CANONIFIER=diff-canonifier-spicy btest-diff output-1 +# @TEST-EXEC: TEST_DIFF_CANONIFIER=diff-canonifier-spicy btest-diff output-2 # @TEST-START-FILE ssh.spicy module SSH;