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

Fix mime type diff canonifier to also skip mime_desc columns

Browse source 
In particular, the ftp.log baseline in the new ipv6 test in bro-testing
was failign on various platforms because of this.
This commit is contained in:
Jon Siwek 2012-08-17 15:22:51 -05:00
parent 508ac1c7ba
commit 907c92e1cc
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
testing/scripts/diff-remove-mime-types
View file

@ -3,20 +3,27 @@
# A diff canonifier that removes all MIME types because libmagic output
# can differ between installations.
BEGIN { FS="\t"; OFS="\t"; column = -1; }
BEGIN { FS="\t"; OFS="\t"; type_col = -1; desc_col = -1 }
/^#fields/ {
for ( i = 2; i < NF; ++i )
{
if ( $i == "mime_type" )
column = i-1;
type_col = i-1;
if ( $i == "mime_desc" )
desc_col = i-1;
}
}
column >= 0 {
if ( $column != "-" )
function remove_mime (n) {
if ( n >= 0 && $n != "-" )
# Mark that it's set, but ignore content.
$column = "+";
$n = "+"
}
remove_mime(type_col)
remove_mime(desc_col)
{
print;
}