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

Fix binary baseline & line-end problem

Browse source 
By default all baslines are run through diff-remove-timestamp. On a BSD
sed implementation, this means that a newline is added to the end of the
file, if no newline was there originally. This behavior differs from GNU
sed, which does not add a newline.

In this commit we unify this behavior by always adding a newline, even
when using GNU sed. This commit also disables the canonifier for a bunch
of binary baselines, so we do not have to change them.
This commit is contained in:
Johanna Amann 2020-12-04 15:51:07 +00:00 • committed by Christian Kreibich
parent 7040e30431
commit 442cb40db8
12 changed files with 24 additions and 23 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: btest-diff 1-file
# @TEST-EXEC: btest-diff 2-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 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: btest-diff 1-file
# @TEST-EXEC: btest-diff 2-file
# @TEST-EXEC: btest-diff 3-file
# @TEST-EXEC: btest-diff 4-file
# @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
@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: btest-diff 1-file
# @TEST-EXEC: btest-diff 2-file
# @TEST-EXEC: btest-diff 3-file
# @TEST-EXEC: btest-diff 4-file
# @TEST-EXEC: btest-diff 5-file
# @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
@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: btest-diff 1-file
# @TEST-EXEC: btest-diff 2-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file
@load base/protocols/http