More bro-to-zeek renaming in the unit tests

testing/btest/scripts/base/frameworks/intel/expire-item.zeek

@@ -1,7 +1,7 @@
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 21
-# @TEST-EXEC: cat broproc/intel.log > output
-# @TEST-EXEC: cat broproc/.stdout >> output
+# @TEST-EXEC: cat zeekproc/intel.log > output
+# @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: btest-diff output
 
 # @TEST-START-FILE intel.dat

testing/btest/scripts/base/frameworks/intel/filter-item.zeek

@@ -1,7 +1,7 @@
 
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 5
-# @TEST-EXEC: btest-diff broproc/intel.log
+# @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
 #fields	indicator	indicator_type	meta.source	meta.desc	meta.url

testing/btest/scripts/base/frameworks/intel/input-and-match.zeek

@@ -1,7 +1,7 @@
 
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 5
-# @TEST-EXEC: btest-diff broproc/intel.log
+# @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
 #fields	indicator	indicator_type	meta.source	meta.desc	meta.url

testing/btest/scripts/base/frameworks/intel/match-subnet.zeek

@@ -1,7 +1,7 @@
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 5
-# @TEST-EXEC: cat broproc/intel.log > output
-# @TEST-EXEC: cat broproc/.stdout >> output
+# @TEST-EXEC: cat zeekproc/intel.log > output
+# @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: btest-diff output
 
 # @TEST-START-FILE intel.dat

testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek

@@ -1,7 +1,7 @@
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 5
-# @TEST-EXEC: cat broproc/reporter.log > output
-# @TEST-EXEC: cat broproc/.stdout >> output
+# @TEST-EXEC: cat zeekproc/reporter.log > output
+# @TEST-EXEC: cat zeekproc/.stdout >> output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff output
 
 # @TEST-START-FILE intel.dat

testing/btest/scripts/base/frameworks/logging/rotate.zeek

@@ -1,6 +1,6 @@
 #
-# @TEST-EXEC: zeek -b -r ${TRACES}/rotation.trace %INPUT >bro.out 2>&1
-# @TEST-EXEC: grep "test" bro.out | sort >out
+# @TEST-EXEC: zeek -b -r ${TRACES}/rotation.trace %INPUT >zeek.out 2>&1
+# @TEST-EXEC: grep "test" zeek.out | sort >out
 # @TEST-EXEC: for i in `ls test.*.log | sort`; do printf '> %s\n' $i; cat $i; done >>out
 # @TEST-EXEC: btest-diff out
 

testing/btest/scripts/base/misc/version.zeek

@@ -21,7 +21,7 @@ print Version::parse("12.5");
 print Version::parse("1.12-beta-drunk");
 print Version::parse("JustARandomString");
 
-# check that current running version of Bro parses without error
+# check that current running version of Zeek parses without error
 Version::parse(bro_version());
 
 @TEST-START-NEXT

testing/btest/scripts/base/protocols/krb/smb2_krb.test

@@ -2,7 +2,7 @@
 # Kerberos analyzer can open the AD ticket in the Negociate
 # Protocol Request and find the user.
 #
-# @TEST-REQUIRES: grep -q "#define USE_KRB5" $BUILD/bro-config.h
+# @TEST-REQUIRES: grep -q "#define USE_KRB5" $BUILD/zeek-config.h
 #
 # @TEST-COPY-FILE: ${TRACES}/krb/smb2_krb.keytab
 # @TEST-EXEC: zeek -b -C -r $TRACES/krb/smb2_krb.pcap %INPUT

testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test

@@ -1,7 +1,7 @@
 # This test verifies that without a keytab file no entries are
 # created and no errors happen.
 #
-# @TEST-REQUIRES: grep -q "#define USE_KRB5" $BUILD/bro-config.h
+# @TEST-REQUIRES: grep -q "#define USE_KRB5" $BUILD/zeek-config.h
 #
 # @TEST-COPY-FILE: ${TRACES}/krb/smb2_krb.keytab
 # @TEST-EXEC: zeek -C -r $TRACES/krb/smb2_krb.pcap %INPUT

testing/btest/scripts/base/protocols/modbus/exception_handling.test

@@ -5,4 +5,4 @@
 # the binpac-generated analyzer code to throw a binpac::ExceptionOutOfBound.
 # This should be correctly caught as a type of binpac::Exception and the
 # binpac::ModbusTCP::Exception type that's defined as part of the analyzer
-# shouldn't interfere with that handling and definitely shouldn't crash bro.
+# shouldn't interfere with that handling and definitely shouldn't crash Zeek.

testing/btest/scripts/base/protocols/mysql/encrypted.test

@@ -1,8 +1,9 @@
-# This tests how Bro deals with encrypted connections. Right now, it doesn't log them as it
-# can't parse much of value. We're testing for an empty mysql.log file.
+# This tests how Zeek deals with encrypted connections.  Right now, it
+# doesn't log them as it can't parse much of value.  We're testing for an
+# empty mysql.log file.
 
 # @TEST-EXEC: touch mysql.log
 # @TEST-EXEC: zeek -b -r $TRACES/mysql/encrypted.trace %INPUT
 # @TEST-EXEC: btest-diff mysql.log
 
-@load base/protocols/mysql
+@load base/protocols/mysql

testing/btest/scripts/base/protocols/ssl/cve-2015-3194.test

@@ -1,4 +1,4 @@
-# This tests if Bro does not crash when exposed to CVE-2015-3194
+# This tests if Zeek does not crash when exposed to CVE-2015-3194
 
 # @TEST-EXEC: zeek -r $TRACES/tls/CVE-2015-3194.pcap %INPUT
 # @TEST-EXEC: btest-diff ssl.log

testing/btest/scripts/policy/frameworks/intel/removal.zeek

@@ -1,7 +1,7 @@
 
-# @TEST-EXEC: btest-bg-run broproc zeek %INPUT
+# @TEST-EXEC: btest-bg-run zeekproc zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 5
-# @TEST-EXEC: btest-diff broproc/intel.log
+# @TEST-EXEC: btest-diff zeekproc/intel.log
 
 @TEST-START-FILE intel.dat
 #fields	indicator	indicator_type	meta.source	meta.remove

testing/btest/scripts/site/local-compat.test

@@ -1,14 +1,14 @@
 # @TEST-EXEC: zeek local-`cat $DIST/VERSION | sed 's/\([0-9].[0-9]\).*/\1/g'`.bro
 
 # This tests the compatibility of the past release's site/local.bro
-# script with the current version of Bro.  If the test fails because
+# script with the current version of Zeek.  If the test fails because
 # it doesn't find the right file, that means everything stayed
 # compatibile between releases, so just add a TEST-START-FILE with
-# the contents the latest Bro version's site/local.zeek script.
+# the contents the latest Zeek version's site/local.zeek script.
 # If the test fails while loading the old local.bro, it usually
 # indicates a note will need to be made in NEWS explaining to users
 # how to migrate to the new version and this test's TEST-START-FILE
-# should be updated with the latest contents of site/local.bro.
+# should be updated with the latest contents of site/local.zeek.
 
 @TEST-START-FILE local-2.6.bro
 ##! Local site policy. Customize as appropriate.