Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update btest-diff calls on binary files to using "--binary"

Browse source 
This converts Johanna's TEST_DIFF_CANONIFIER removals via "env -u" to
using the new "btest-diff --binary", and updates the affected baselines.
This commit is contained in:
Christian Kreibich 2020-12-04 23:18:19 -08:00
parent c5fd520c96
commit 17cd740519
27 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek
View file

@ -2,8 +2,8 @@
# @TEST-EXEC: zeek -b -r $TRACES/http/get-gzip.trace $SCRIPTS/file-analysis-test.zeek %INPUT c=2 >get-gzip.out
# @TEST-EXEC: btest-diff get.out
# @TEST-EXEC: btest-diff get-gzip.out
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file
# @TEST-EXEC: btest-diff --binary 1-file
# @TEST-EXEC: btest-diff --binary 2-file
@load base/protocols/http

8
testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek
View file

@ -1,9 +1,9 @@
# @TEST-EXEC: zeek -b -r $TRACES/http/multipart.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 3-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 4-file
# @TEST-EXEC: btest-diff --binary 1-file
# @TEST-EXEC: btest-diff --binary 2-file
# @TEST-EXEC: btest-diff --binary 3-file
# @TEST-EXEC: btest-diff --binary 4-file
@load base/protocols/http

10
testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek
View file

@ -1,10 +1,10 @@
# @TEST-EXEC: zeek -b -r $TRACES/http/pipelined-requests.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 3-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 4-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 5-file
# @TEST-EXEC: btest-diff --binary 1-file
# @TEST-EXEC: btest-diff --binary 2-file
# @TEST-EXEC: btest-diff --binary 3-file
# @TEST-EXEC: btest-diff --binary 4-file
# @TEST-EXEC: btest-diff --binary 5-file
@load base/protocols/http

4
testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek
View file

@ -1,7 +1,7 @@
# @TEST-EXEC: zeek -b -r $TRACES/http/post.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file
# @TEST-EXEC: btest-diff --binary 1-file
# @TEST-EXEC: btest-diff --binary 2-file
@load base/protocols/http

2
testing/btest/scripts/base/frameworks/file-analysis/irc.zeek
View file

@ -1,6 +1,6 @@
# @TEST-EXEC: zeek -b -r $TRACES/irc-dcc-send.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff thefile
# @TEST-EXEC: btest-diff --binary thefile
@load base/protocols/irc

2
testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek
View file

@ -1,6 +1,6 @@
# @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 15
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff test.txt
# @TEST-EXEC: btest-diff --binary test.txt
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
redef exit_only_after_terminate = T;