More bro-to-zeek renaming in the unit tests

This commit is contained in:
Daniel Thayer 2019-05-16 00:01:21 -05:00
parent 72b46268f7
commit 3f9e7138bd
71 changed files with 141 additions and 136 deletions

View file

@ -27,7 +27,7 @@ for i in `echo $files_cwd $files_baseline | sort | uniq`; do
if [[ "$i" == "reporter.log" ]]; then
# Do not diff the reporter.log if it only complains about missing
# GeoIP support.
if ! egrep -v "^#|Bro was not configured for GeoIP support" $i; then
if ! egrep -v "^#|Zeek was not configured for GeoIP support" $i; then
continue
fi
fi

View file

@ -5,6 +5,6 @@
#
# Returns an exit code > 0 if there's a leak.
cat $1 | sed "s#bro *\"\./#../../../build/src/bro \".tmp/$TEST_NAME/#g" | sed 's/ *--gv//g' >$1.tmp && mv $1.tmp $1
cat $1 | sed "s#zeek *\"\./#../../../build/src/zeek \".tmp/$TEST_NAME/#g" | sed 's/ *--gv//g' >$1.tmp && mv $1.tmp $1
grep -qv "detected leaks of" $1

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: zcat $TRACES/trace.gz | bro -r - %INPUT
# @TEST-EXEC: zcat $TRACES/trace.gz | zeek -r - %INPUT
# @TEST-EXEC: $SCRIPTS/diff-all '*.log'
@load testing-setup

View file

@ -9,6 +9,6 @@
@ifdef ( LogAscii::use_json )
# Don't start logging everything as JSON.
# (json-logs.bro activates this).
# (json-logs.zeek activates this).
redef LogAscii::use_json = F;
@endif