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

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

6
testing/btest/scripts/base/files/extract/limit.zeek
View file

@ -1,12 +1,12 @@
# @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=3000 efname=1
# @TEST-EXEC: btest-diff extract_files/1
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/1
# @TEST-EXEC: btest-diff 1.out
# @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=3000 efname=2 double_it=T
# @TEST-EXEC: btest-diff extract_files/2
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/2
# @TEST-EXEC: btest-diff 2.out
# @TEST-EXEC: btest-diff files.log
# @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=7000 efname=3 unlimit_it=T
# @TEST-EXEC: btest-diff extract_files/3
# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/3
# @TEST-EXEC: btest-diff 3.out
@load base/files/extract