diff --git a/src/bro.bif b/src/bro.bif index c3a9f13d56..b356c91fe8 100644 --- a/src/bro.bif +++ b/src/bro.bif @@ -3990,7 +3990,7 @@ function lookup_location%(a: addr%) : geo_location if ( ! missing_geoip_reported ) { - builtin_error("Bro was not configured for GeoIP support"); + builtin_error("Zeek was not configured for GeoIP support"); missing_geoip_reported = 1; } #endif @@ -4047,7 +4047,7 @@ function lookup_asn%(a: addr%) : count if ( ! missing_geoip_reported ) { - builtin_error("Bro was not configured for GeoIP ASN support"); + builtin_error("Zeek was not configured for GeoIP ASN support"); missing_geoip_reported = 1; } #endif diff --git a/testing/README b/testing/README index ba407fcc67..37f8aa9014 100644 --- a/testing/README +++ b/testing/README @@ -1,13 +1,13 @@ -This directory contains suites for testing for Bro's correct +This directory contains suites for testing for Zeek's correct operation: btest/ - An ever-growing set of small unit tests testing Bro's + An ever-growing set of small unit tests testing Zeek's functionality. external/ A framework for downloading additional test sets that run more - complex Bro configuration on larger traces files. Due to their + complex Zeek configuration on larger traces files. Due to their size, these are not included directly. See the README for more information. diff --git a/testing/btest/Baseline/core.option-runtime-errors/.stderr b/testing/btest/Baseline/core.option-runtime-errors/.stderr index 0d4da12312..a8362f52c0 100644 --- a/testing/btest/Baseline/core.option-runtime-errors/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors/option-runtime-errors.zeek, line 8: Could not find ID named 'B' (Option::set(B, 6, )) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, 6, )) diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.filter-item/broproc.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.filter-item/zeekproc.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.filter-item/broproc.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.filter-item/zeekproc.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.input-and-match/broproc.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.input-and-match/zeekproc.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.input-and-match/broproc.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.input-and-match/zeekproc.intel.log diff --git a/testing/btest/Baseline/scripts.base.misc.find-filtered-trace/out1 b/testing/btest/Baseline/scripts.base.misc.find-filtered-trace/out1 index 2f84ca097a..3c3f495e11 100644 --- a/testing/btest/Baseline/scripts.base.misc.find-filtered-trace/out1 +++ b/testing/btest/Baseline/scripts.base.misc.find-filtered-trace/out1 @@ -1 +1 @@ -1389719059.311687 warning in /Users/jsiwek/Projects/bro/bro/scripts/base/misc/find-filtered-trace.zeek, line 48: The analyzed trace file was determined to contain only TCP control packets, which may indicate it's been pre-filtered. By default, Bro reports the missing segments for this type of trace, but the 'detect_filtered_trace' option may be toggled if that's not desired. +1389719059.311687 warning in /Users/jsiwek/Projects/bro/bro/scripts/base/misc/find-filtered-trace.zeek, line 48: The analyzed trace file was determined to contain only TCP control packets, which may indicate it's been pre-filtered. By default, Zeek reports the missing segments for this type of trace, but the 'detect_filtered_trace' option may be toggled if that's not desired. diff --git a/testing/btest/Baseline/scripts.policy.frameworks.intel.removal/broproc.intel.log b/testing/btest/Baseline/scripts.policy.frameworks.intel.removal/zeekproc.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.intel.removal/broproc.intel.log rename to testing/btest/Baseline/scripts.policy.frameworks.intel.removal/zeekproc.intel.log diff --git a/testing/btest/README b/testing/btest/README index 200d1a3e0e..f20205c36b 100644 --- a/testing/btest/README +++ b/testing/btest/README @@ -1,4 +1,4 @@ -This a test suite of small "unit tests" that verify individual pieces of Bro +This a test suite of small "unit tests" that verify individual pieces of Zeek functionality. They all utilize BTest, a simple framework/driver for writing unit tests. More information about BTest can be found at https://github.com/zeek/btest @@ -20,14 +20,14 @@ Significant Subdirectories Packet captures utilized by the various BTest tests. * scripts/ - This hierarchy of tests emulates the hierarchy of the Bro scripts/ + This hierarchy of tests emulates the hierarchy of the Zeek scripts/ directory. * coverage/ This collection of tests relates to checking whether we're covering everything we want to in terms of tests, documentation, and which - scripts get loaded in different Bro configurations. These tests are - more prone to fail as new Bro scripts are developed and added to the + scripts get loaded in different Zeek configurations. These tests are + more prone to fail as new Zeek scripts are developed and added to the distribution -- checking the individual test's comments is the best place to check for more details on what exactly the test is checking and hints on how to fix it when it fails. @@ -48,7 +48,7 @@ run ``btest`` directly with desired options/arguments. Examples: You can specify a directory on the command line to run just the tests contained in that directory. This is useful if you wish to run all of a given type of test, without running all the tests - there are. For example, "btest scripts" will run all of the Bro + there are. For example, "btest scripts" will run all of the Zeek script unit tests. diff --git a/testing/btest/bifs/dump_current_packet.zeek b/testing/btest/bifs/dump_current_packet.zeek index d78252edf4..ce177a1daf 100644 --- a/testing/btest/bifs/dump_current_packet.zeek +++ b/testing/btest/bifs/dump_current_packet.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-diff 2.hex # Note that the hex output will contain global pcap header information, -# including Bro's snaplen setting (so maybe check that out in the case +# including Zeek's snaplen setting (so maybe check that out in the case # you are reading this message due to this test failing in the future). global i: count = 0; diff --git a/testing/btest/broker/store/type-conversion.zeek b/testing/btest/broker/store/type-conversion.zeek index 919bfd91ca..733a10af73 100644 --- a/testing/btest/broker/store/type-conversion.zeek +++ b/testing/btest/broker/store/type-conversion.zeek @@ -13,7 +13,7 @@ type R2: record { event zeek_init() { - ### Print every broker data type + ### Print every Broker data type print Broker::data_type(Broker::data(T)); print Broker::data_type(Broker::data(+1)); print Broker::data_type(Broker::data(1)); @@ -33,7 +33,7 @@ event zeek_init() print "***************************"; - ### Convert a Bro value to a broker value, then print the result + ### Convert a Zeek value to a Broker value, then print the result print (Broker::data(T) as bool); print (Broker::data(F) as bool); diff --git a/testing/btest/core/disable-mobile-ipv6.test b/testing/btest/core/disable-mobile-ipv6.test index b9914f260f..eace575cca 100644 --- a/testing/btest/core/disable-mobile-ipv6.test +++ b/testing/btest/core/disable-mobile-ipv6.test @@ -1,4 +1,5 @@ -# @TEST-REQUIRES: grep -q "#undef ENABLE_MOBILE_IPV6" $BUILD/bro-config.h +# @TEST-REQUIRES: grep -q "#undef ENABLE_MOBILE_IPV6" $BUILD/zeek-config.h +# # @TEST-EXEC: zeek -r $TRACES/mobile-ipv6/mip6_back.trace %INPUT # @TEST-EXEC: btest-diff weird.log diff --git a/testing/btest/core/expr-exception.zeek b/testing/btest/core/expr-exception.zeek index 58eee4a07d..79f460b1e4 100644 --- a/testing/btest/core/expr-exception.zeek +++ b/testing/btest/core/expr-exception.zeek @@ -1,5 +1,5 @@ # Expressions in an event handler that raise interpreter exceptions -# shouldn't abort Bro entirely, but just return from the function body. +# shouldn't abort Zeek entirely, but just return from the function body. # # @TEST-EXEC: zeek -r $TRACES/wikipedia.trace %INPUT >output # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log diff --git a/testing/btest/core/ip-broken-header.zeek b/testing/btest/core/ip-broken-header.zeek index 1e2d8c95c6..08c72b06f1 100644 --- a/testing/btest/core/ip-broken-header.zeek +++ b/testing/btest/core/ip-broken-header.zeek @@ -1,5 +1,5 @@ # This test has a trace that was generated from fuzzing which used to cause -# OOB reads in Bro. It has a number of packets broken in weird ways. +# OOB reads in Zeek. It has a number of packets broken in weird ways. # # @TEST-EXEC: gunzip -c $TRACES/trunc/mpls-6in6-broken.pcap.gz | zeek -C -b -r - %INPUT # @TEST-EXEC: btest-diff weird.log diff --git a/testing/btest/core/leaks/broker/data.zeek b/testing/btest/core/leaks/broker/data.zeek index 9d4aa120a7..9f9daadee0 100644 --- a/testing/btest/core/leaks/broker/data.zeek +++ b/testing/btest/core/leaks/broker/data.zeek @@ -110,7 +110,7 @@ if ( did_it ) return; did_it = T; -### Print every broker data type +### Print every Broker data type print Broker::data_type(Broker::data(T)); print Broker::data_type(Broker::data(+1)); @@ -134,7 +134,7 @@ print Broker::data_type(Broker::data(r)); print "***************************"; -### Convert a Bro value to a broker value, then print the result +### Convert a Zeek value to a Broker value, then print the result print (Broker::data(T)) as bool; print (Broker::data(F)) as bool; @@ -175,7 +175,7 @@ print broker_to_bro_record(cr); print "***************************"; -### Test the broker set BIFs +### Test the Broker set BIFs cs = Broker::set_create(); print Broker::set_size(cs); @@ -197,7 +197,7 @@ print broker_to_bro_set(cs); print "***************************"; -### Test the broker table BIFs +### Test the Broker table BIFs ct = Broker::table_create(); print Broker::table_size(ct); @@ -221,7 +221,7 @@ print broker_to_bro_table(ct); print "***************************"; -### Test the broker vector BIFs +### Test the Broker vector BIFs cv = Broker::vector_create(); print Broker::vector_size(cv); @@ -244,7 +244,7 @@ print broker_to_bro_vector(cv); print "***************************"; -### Test the broker record BIFs +### Test the Broker record BIFs cr = Broker::record_create(3); print Broker::record_size(cr); diff --git a/testing/btest/core/leaks/ip-in-ip.test b/testing/btest/core/leaks/ip-in-ip.test index 8f69f4ddd2..41cc6a7724 100644 --- a/testing/btest/core/leaks/ip-in-ip.test +++ b/testing/btest/core/leaks/ip-in-ip.test @@ -4,9 +4,9 @@ # # @TEST-GROUP: leaks # -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro1 zeek -m -b -r $TRACES/tunnels/6in6.pcap %INPUT -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro2 zeek -m -b -r $TRACES/tunnels/6in6in6.pcap %INPUT -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro3 zeek -m -b -r $TRACES/tunnels/6in6-tunnel-change.pcap %INPUT +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek1 zeek -m -b -r $TRACES/tunnels/6in6.pcap %INPUT +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek2 zeek -m -b -r $TRACES/tunnels/6in6in6.pcap %INPUT +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek3 zeek -m -b -r $TRACES/tunnels/6in6-tunnel-change.pcap %INPUT # @TEST-EXEC: btest-bg-wait 60 event new_connection(c: connection) diff --git a/testing/btest/core/load-duplicates.zeek b/testing/btest/core/load-duplicates.zeek index 3ab98015d5..846350988e 100644 --- a/testing/btest/core/load-duplicates.zeek +++ b/testing/btest/core/load-duplicates.zeek @@ -1,15 +1,15 @@ -# This tests bro's mechanism to prevent duplicate script loading. +# This tests Zeek's mechanism to prevent duplicate script loading. # # @TEST-EXEC: mkdir -p foo/bar -# @TEST-EXEC: echo "@load bar/test" >loader.bro -# @TEST-EXEC: cp %INPUT foo/bar/test.bro -# @TEST-EXEC: cp %INPUT foo/bar/test2.bro +# @TEST-EXEC: echo "@load bar/test" >loader.zeek +# @TEST-EXEC: cp %INPUT foo/bar/test.zeek +# @TEST-EXEC: cp %INPUT foo/bar/test2.zeek # # @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test -# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test.bro +# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test.zeek # @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test -# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test.bro -# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader `pwd`/foo/bar/test.bro +# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test.zeek +# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader `pwd`/foo/bar/test.zeek # @TEST-EXEC-FAIL: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test2 global pi = 3.14; diff --git a/testing/btest/core/mobile-ipv6-home-addr.test b/testing/btest/core/mobile-ipv6-home-addr.test index a7e803c24a..9be171074a 100644 --- a/testing/btest/core/mobile-ipv6-home-addr.test +++ b/testing/btest/core/mobile-ipv6-home-addr.test @@ -1,4 +1,5 @@ -# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/bro-config.h +# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/zeek-config.h +# # @TEST-EXEC: zeek -b -r $TRACES/mobile-ipv6/ipv6-mobile-hoa.trace %INPUT >output # @TEST-EXEC: btest-diff output diff --git a/testing/btest/core/mobile-ipv6-routing.test b/testing/btest/core/mobile-ipv6-routing.test index f394ff865c..cca944f9c4 100644 --- a/testing/btest/core/mobile-ipv6-routing.test +++ b/testing/btest/core/mobile-ipv6-routing.test @@ -1,4 +1,5 @@ -# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/bro-config.h +# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/zeek-config.h +# # @TEST-EXEC: zeek -b -r $TRACES/mobile-ipv6/ipv6-mobile-routing.trace %INPUT >output # @TEST-EXEC: btest-diff output diff --git a/testing/btest/core/mobility-checksums.test b/testing/btest/core/mobility-checksums.test index ee849c08a6..d680fdf406 100644 --- a/testing/btest/core/mobility-checksums.test +++ b/testing/btest/core/mobility-checksums.test @@ -1,4 +1,5 @@ -# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/bro-config.h +# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/zeek-config.h +# # @TEST-EXEC: zeek -r $TRACES/chksums/mip6-bad-mh-chksum.pcap # @TEST-EXEC: mv weird.log bad.out # @TEST-EXEC: zeek -r $TRACES/chksums/ip6-hoa-tcp-bad-chksum.pcap diff --git a/testing/btest/core/mobility_msg.test b/testing/btest/core/mobility_msg.test index f0017e4cdd..89538fc667 100644 --- a/testing/btest/core/mobility_msg.test +++ b/testing/btest/core/mobility_msg.test @@ -1,4 +1,5 @@ -# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/bro-config.h +# @TEST-REQUIRES: grep -q "#define ENABLE_MOBILE_IPV6" $BUILD/zeek-config.h +# # @TEST-EXEC: zeek -b -r $TRACES/mobile-ipv6/mip6_back.trace %INPUT >output # @TEST-EXEC: zeek -b -r $TRACES/mobile-ipv6/mip6_be.trace %INPUT >>output # @TEST-EXEC: zeek -b -r $TRACES/mobile-ipv6/mip6_brr.trace %INPUT >>output diff --git a/testing/btest/core/nop.zeek b/testing/btest/core/nop.zeek index d1316cdccd..e0f6f70323 100644 --- a/testing/btest/core/nop.zeek +++ b/testing/btest/core/nop.zeek @@ -1,4 +1,4 @@ -# Bro shouldn't crash when doing nothing, nor outputting anything. +# Zeek shouldn't crash when doing nothing, nor outputting anything. # # @TEST-EXEC: cat /dev/null | zeek >output 2>&1 # @TEST-EXEC: btest-diff output diff --git a/testing/btest/core/option-runtime-errors.zeek b/testing/btest/core/option-runtime-errors.zeek index aa7ad77874..ef512c6a8e 100644 --- a/testing/btest/core/option-runtime-errors.zeek +++ b/testing/btest/core/option-runtime-errors.zeek @@ -1,8 +1,9 @@ # @TEST-EXEC: zeek %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr -# Errors that happen during runtime. At least at the moment we are not checking these early enough -# that Bro will bail out during startup. Perhaps we want to change this later. +# Errors that happen during runtime. At least at the moment we are not +# checking these early enough that Zeek will bail out during startup. Perhaps +# we want to change this later. option A = 5; Option::set("B", 6); diff --git a/testing/btest/core/recursive-event.zeek b/testing/btest/core/recursive-event.zeek index 75e3ce46d5..f82b4ed58b 100644 --- a/testing/btest/core/recursive-event.zeek +++ b/testing/btest/core/recursive-event.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff output # In old version, the event would keep triggering endlessely, with the network -# time not moving forward and Bro not terminating. +# time not moving forward and Zeek not terminating. # # Note that the output will not be 20 because we still execute two rounds # of events every time we drain and also at startup several (currently 3) diff --git a/testing/btest/core/reporter-shutdown-order-errors.zeek b/testing/btest/core/reporter-shutdown-order-errors.zeek index 03943679ff..f1478124b8 100644 --- a/testing/btest/core/reporter-shutdown-order-errors.zeek +++ b/testing/btest/core/reporter-shutdown-order-errors.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: touch reporter.log && chmod -w reporter.log # @TEST-EXEC: zeek %INPUT >out 2>&1 -# Output doesn't really matter, but we just want to know that Bro shutdowns +# Output doesn't really matter, but we just want to know that Zeek shutdowns # without crashing in such scenarios (reporter log not writable # and also reporter errors being emitting during shutdown). diff --git a/testing/btest/core/tcp/truncated-header.zeek b/testing/btest/core/tcp/truncated-header.zeek index babfd7531c..145f415754 100644 --- a/testing/btest/core/tcp/truncated-header.zeek +++ b/testing/btest/core/tcp/truncated-header.zeek @@ -3,7 +3,7 @@ event tcp_packet(c: connection, is_orig: bool, flags: string, seq: count, ack: count, len: count, payload: string) { - # Just having this handler used to crash Bro on this trace. - print network_time(), c$id; + # Just having this handler used to crash Zeek on this trace. + print network_time(), c$id; } diff --git a/testing/btest/core/truncation.test b/testing/btest/core/truncation.test index 22db760810..b602f13585 100644 --- a/testing/btest/core/truncation.test +++ b/testing/btest/core/truncation.test @@ -8,7 +8,7 @@ # @TEST-EXEC: cat weird.log >> output # If an ICMP packet's payload is truncated due to too small snaplen, -# the checksum calculation is bypassed (and Bro doesn't crash, of course). +# the checksum calculation is bypassed (and Zeek doesn't crash, of course). # @TEST-EXEC: rm -f weird.log # @TEST-EXEC: zeek -r $TRACES/trunc/icmp-payload-trunc.pcap diff --git a/testing/btest/core/tunnels/ip-in-ip-version.zeek b/testing/btest/core/tunnels/ip-in-ip-version.zeek index f5ff69c21c..49e8a5a3d0 100644 --- a/testing/btest/core/tunnels/ip-in-ip-version.zeek +++ b/testing/btest/core/tunnels/ip-in-ip-version.zeek @@ -10,5 +10,3 @@ # @TEST-EXEC: btest-diff output -@load base/frameworks/notice/weird.bro - diff --git a/testing/btest/core/vector-assignment.zeek b/testing/btest/core/vector-assignment.zeek index 8593562892..a66830f713 100644 --- a/testing/btest/core/vector-assignment.zeek +++ b/testing/btest/core/vector-assignment.zeek @@ -2,7 +2,7 @@ # This regression test checks a special case in the vector code. In this case # UnaryExpr will be called with a Type() of any. Tests succeeds if it does not -# crash Bro. +# crash Zeek. type OptionCacheValue: record { val: any; diff --git a/testing/btest/doc/record-add.zeek b/testing/btest/doc/record-add.zeek index baebaaf3f2..1c764cae5f 100644 --- a/testing/btest/doc/record-add.zeek +++ b/testing/btest/doc/record-add.zeek @@ -1,6 +1,6 @@ # @TEST-EXEC: zeek -b %INPUT -# To support documentation of type aliases, Bro clones declared types +# To support documentation of type aliases, Zeek clones declared types # (see add_type() in Var.cc) in order to keep track of type names and aliases. # This test makes sure that the cloning is done in a way that's compatible # with adding fields to a record type -- we want to be sure that cloning diff --git a/testing/btest/language/for.zeek b/testing/btest/language/for.zeek index 246eb47051..6918e78818 100644 --- a/testing/btest/language/for.zeek +++ b/testing/btest/language/for.zeek @@ -53,5 +53,5 @@ event zeek_init() test_case("keys that are tuples", s1 == "1 2 hi"); - # Tests for key value for loop are in key-value-for.bro + # Note: Tests for key value "for" loop are in key-value-for.zeek } diff --git a/testing/btest/language/no-module.zeek b/testing/btest/language/no-module.zeek index 3369e9b14e..f78c9da6c0 100644 --- a/testing/btest/language/no-module.zeek +++ b/testing/btest/language/no-module.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: zeek -b %INPUT secondtestfile >out # @TEST-EXEC: btest-diff out -# This is the same test as "module.bro", but here we omit the module definition +# This is the same test as "module.zeek", but here we omit the module definition global num: count = 123; diff --git a/testing/btest/language/record-bad-ctor.zeek b/testing/btest/language/record-bad-ctor.zeek index 7c465e7dea..40bafa47de 100644 --- a/testing/btest/language/record-bad-ctor.zeek +++ b/testing/btest/language/record-bad-ctor.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out -# At least shouldn't crash Bro, just report the invalid record ctor. +# At least shouldn't crash Zeek, just report the invalid record ctor. global asdfasdf; const blah = [$ports=asdfasdf]; diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh index 9470231888..d7cf3fd7b0 100644 --- a/testing/btest/plugins/bifs-and-scripts-install.sh +++ b/testing/btest/plugins/bifs-and-scripts-install.sh @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: bash %INPUT # @TEST-EXEC: ./configure --bro-dist=${DIST} --install-root=`pwd`/test-install # @TEST-EXEC: make diff --git a/testing/btest/plugins/bifs-and-scripts.sh b/testing/btest/plugins/bifs-and-scripts.sh index 222c961b2d..3cbe9c52d1 100644 --- a/testing/btest/plugins/bifs-and-scripts.sh +++ b/testing/btest/plugins/bifs-and-scripts.sh @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: bash %INPUT # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/file.zeek b/testing/btest/plugins/file.zeek index 9193fc7101..1f87103472 100644 --- a/testing/btest/plugins/file.zeek +++ b/testing/btest/plugins/file.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/file-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/hooks.zeek b/testing/btest/plugins/hooks.zeek index be00e50f5c..11ca139002 100644 --- a/testing/btest/plugins/hooks.zeek +++ b/testing/btest/plugins/hooks.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Hooks +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Hooks # @TEST-EXEC: cp -r %DIR/hooks-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Demo::Hooks" BRO_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/http/get.trace %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >output diff --git a/testing/btest/plugins/init-plugin.zeek b/testing/btest/plugins/init-plugin.zeek index c3332f170b..9099e02585 100644 --- a/testing/btest/plugins/init-plugin.zeek +++ b/testing/btest/plugins/init-plugin.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output # @TEST-EXEC: echo === >>output diff --git a/testing/btest/plugins/logging-hooks.zeek b/testing/btest/plugins/logging-hooks.zeek index 46a724957e..a901f14f70 100644 --- a/testing/btest/plugins/logging-hooks.zeek +++ b/testing/btest/plugins/logging-hooks.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Log Hooks +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Log Hooks # @TEST-EXEC: cp -r %DIR/logging-hooks-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Log::Hooks" BRO_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >output diff --git a/testing/btest/plugins/pktdumper.zeek b/testing/btest/plugins/pktdumper.zeek index 0ed93db5a9..8595c8a278 100644 --- a/testing/btest/plugins/pktdumper.zeek +++ b/testing/btest/plugins/pktdumper.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/pktdumper-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/pktsrc.zeek b/testing/btest/plugins/pktsrc.zeek index 7aafe490ba..ac88b95162 100644 --- a/testing/btest/plugins/pktsrc.zeek +++ b/testing/btest/plugins/pktsrc.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/pktsrc-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/plugin-nopatchversion.zeek b/testing/btest/plugins/plugin-nopatchversion.zeek index d2460e4abc..19b3fdac62 100644 --- a/testing/btest/plugins/plugin-nopatchversion.zeek +++ b/testing/btest/plugins/plugin-nopatchversion.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Testing NoPatchVersion +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing NoPatchVersion # @TEST-EXEC: cp -r %DIR/plugin-nopatchversion-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=$(pwd) zeek -N Testing::NoPatchVersion >> output diff --git a/testing/btest/plugins/plugin-withpatchversion.zeek b/testing/btest/plugins/plugin-withpatchversion.zeek index 4ea5511929..29c5cb7907 100644 --- a/testing/btest/plugins/plugin-withpatchversion.zeek +++ b/testing/btest/plugins/plugin-withpatchversion.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Testing WithPatchVersion +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing WithPatchVersion # @TEST-EXEC: cp -r %DIR/plugin-withpatchversion-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=$(pwd) zeek -N Testing::WithPatchVersion >> output diff --git a/testing/btest/plugins/protocol.zeek b/testing/btest/plugins/protocol.zeek index 14b2b09ee9..b0d6f89e88 100644 --- a/testing/btest/plugins/protocol.zeek +++ b/testing/btest/plugins/protocol.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/protocol-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/reader.zeek b/testing/btest/plugins/reader.zeek index 2c62db375d..0b0b2c4916 100644 --- a/testing/btest/plugins/reader.zeek +++ b/testing/btest/plugins/reader.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/reader-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/plugins/reporter-hook.zeek b/testing/btest/plugins/reporter-hook.zeek index 6c6c1fe323..1987b4e22b 100644 --- a/testing/btest/plugins/reporter-hook.zeek +++ b/testing/btest/plugins/reporter-hook.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Reporter Hook +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Reporter Hook # @TEST-EXEC: cp -r %DIR/reporter-hook-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Reporter::Hook" BRO_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq >output diff --git a/testing/btest/plugins/writer.zeek b/testing/btest/plugins/writer.zeek index a10f4fb218..62224ece33 100644 --- a/testing/btest/plugins/writer.zeek +++ b/testing/btest/plugins/writer.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin -u . Demo Foo +# @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo # @TEST-EXEC: cp -r %DIR/writer-plugin/* . # @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output diff --git a/testing/btest/scripts/base/frameworks/intel/expire-item.zeek b/testing/btest/scripts/base/frameworks/intel/expire-item.zeek index a417f8a42c..8f493947fa 100644 --- a/testing/btest/scripts/base/frameworks/intel/expire-item.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek index 4149c33277..3c5db1147e 100644 --- a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek index a7a9bcc7af..f0f5e59511 100644 --- a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek b/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek index 41a018efa4..ab6399f45b 100644 --- a/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek index 960c55f3c2..3dfcb9e334 100644 --- a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/logging/rotate.zeek b/testing/btest/scripts/base/frameworks/logging/rotate.zeek index a7ae0df75a..235bc3829f 100644 --- a/testing/btest/scripts/base/frameworks/logging/rotate.zeek +++ b/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 diff --git a/testing/btest/scripts/base/misc/version.zeek b/testing/btest/scripts/base/misc/version.zeek index da911425e6..9826c69d58 100644 --- a/testing/btest/scripts/base/misc/version.zeek +++ b/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 diff --git a/testing/btest/scripts/base/protocols/krb/smb2_krb.test b/testing/btest/scripts/base/protocols/krb/smb2_krb.test index 38b6f592f4..a5ffd20ebc 100644 --- a/testing/btest/scripts/base/protocols/krb/smb2_krb.test +++ b/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 diff --git a/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test b/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test index e54b0d4ece..557b0128b5 100644 --- a/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test +++ b/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 diff --git a/testing/btest/scripts/base/protocols/modbus/exception_handling.test b/testing/btest/scripts/base/protocols/modbus/exception_handling.test index cb62bd7a3b..b249fd33b0 100644 --- a/testing/btest/scripts/base/protocols/modbus/exception_handling.test +++ b/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. diff --git a/testing/btest/scripts/base/protocols/mysql/encrypted.test b/testing/btest/scripts/base/protocols/mysql/encrypted.test index 0f806e4e25..d6bfb0a271 100644 --- a/testing/btest/scripts/base/protocols/mysql/encrypted.test +++ b/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 \ No newline at end of file +@load base/protocols/mysql diff --git a/testing/btest/scripts/base/protocols/ssl/cve-2015-3194.test b/testing/btest/scripts/base/protocols/ssl/cve-2015-3194.test index 2f11f84df1..ce405cb405 100644 --- a/testing/btest/scripts/base/protocols/ssl/cve-2015-3194.test +++ b/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 diff --git a/testing/btest/scripts/policy/frameworks/intel/removal.zeek b/testing/btest/scripts/policy/frameworks/intel/removal.zeek index 7ca2bd5541..fe2938e711 100644 --- a/testing/btest/scripts/policy/frameworks/intel/removal.zeek +++ b/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 diff --git a/testing/btest/scripts/site/local-compat.test b/testing/btest/scripts/site/local-compat.test index 036f9184b0..1627b00523 100644 --- a/testing/btest/scripts/site/local-compat.test +++ b/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. diff --git a/testing/coverage/README b/testing/coverage/README index d1352640f2..cc21827817 100644 --- a/testing/coverage/README +++ b/testing/coverage/README @@ -1,5 +1,5 @@ -On a Bro build configured with --enable-coverage, this script produces a code -coverage report after Bro has been invoked. The intended application of this +On a Zeek build configured with --enable-coverage, this script produces a code +coverage report after Zeek has been invoked. The intended application of this script is after the btest testsuite has run. This combination (btests first, coverage computation afterward) happens automatically when running "make" in the testing directory. This script puts .gcov files (which are included in diff --git a/testing/coverage/code_coverage.sh b/testing/coverage/code_coverage.sh index 758b2fa915..79999abe19 100755 --- a/testing/coverage/code_coverage.sh +++ b/testing/coverage/code_coverage.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# On a Bro build configured with --enable-coverage, this script -# produces a code coverage report after Bro has been invoked. The +# On a Zeek build configured with --enable-coverage, this script +# produces a code coverage report after Zeek has been invoked. The # intended application of this script is after the btest testsuite has # run. This combination (btests first, coverage computation afterward) # happens automatically when running "make" in the testing directory. @@ -12,7 +12,7 @@ # 1. Run test suite # 2. Check for .gcda files existing. # 3a. Run gcov (-p to preserve path) -# 3b. Prune .gcov files for objects outside of the Bro tree +# 3b. Prune .gcov files for objects outside of the Zeek tree # 4a. Analyze .gcov files generated and create summary file # 4b. Send .gcov files to appropriate path # @@ -52,7 +52,7 @@ function check_file_coverage { function check_group_coverage { DATA="$1" # FILE CONTAINING COVERAGE DATA - SRC_FOLDER="$2" # WHERE BRO WAS COMPILED + SRC_FOLDER="$2" # WHERE ZEEK WAS COMPILED OUTPUT="$3" # Prints all the relevant directories @@ -117,9 +117,9 @@ else exit 1 fi -# 3b. Prune gcov files that fall outside of the Bro tree: +# 3b. Prune gcov files that fall outside of the Zeek tree: # Look for files containing gcov's slash substitution character "#" -# and remove any that don't contain the Bro path root. +# and remove any that don't contain the Zeek path root. echo -n "Pruning out-of-tree coverage files... " PREFIX=$(echo "$BASE" | sed 's|/|#|g') for i in "$TMP"/*#*.gcov; do diff --git a/testing/coverage/lcov_html.sh b/testing/coverage/lcov_html.sh index c729b2145c..f17e583e2c 100755 --- a/testing/coverage/lcov_html.sh +++ b/testing/coverage/lcov_html.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# On a Bro build configured with --enable-coverage, this script -# produces a code coverage report in HTML format after Bro has been invoked. The +# On a Zeek build configured with --enable-coverage, this script +# produces a code coverage report in HTML format after Zeek has been invoked. The # intended application of this script is after the btest testsuite has run. # This depends on lcov to run. diff --git a/testing/external/README b/testing/external/README index ee6d71979e..6ab327b581 100644 --- a/testing/external/README +++ b/testing/external/README @@ -2,9 +2,9 @@ Test Suite for Large Trace Files ================================ -This test-suite runs more complex Bro configurations on larger trace +This test-suite runs more complex Zeek configurations on larger trace files, and compares the results to a pre-established baseline. Due to -their size, both traces and baseline are not part of the main Bro +their size, both traces and baseline are not part of the main Zeek repository but kept externally. In addition to the publically provided files, one can also add a local set to the test-suite for running on private traces. @@ -60,7 +60,7 @@ To update a test's baseline, first run ``btest`` in update mode: .. console: - > cd bro-testing + > cd zeek-testing > btest -u tests/test-you-want-to-update Then use ``git`` to commit the changes and push the changes upstream diff --git a/testing/external/scripts/diff-all b/testing/external/scripts/diff-all index d51f3b294f..0caa5078be 100755 --- a/testing/external/scripts/diff-all +++ b/testing/external/scripts/diff-all @@ -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 diff --git a/testing/external/scripts/perftools-adapt-paths b/testing/external/scripts/perftools-adapt-paths index cfecd39993..cbfaa610ab 100755 --- a/testing/external/scripts/perftools-adapt-paths +++ b/testing/external/scripts/perftools-adapt-paths @@ -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 diff --git a/testing/external/scripts/skel/test.skeleton b/testing/external/scripts/skel/test.skeleton index a76f3d4d09..aa32e72e7a 100644 --- a/testing/external/scripts/skel/test.skeleton +++ b/testing/external/scripts/skel/test.skeleton @@ -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 diff --git a/testing/external/scripts/testing-setup.zeek b/testing/external/scripts/testing-setup.zeek index d24813e1fc..18e7c4783f 100644 --- a/testing/external/scripts/testing-setup.zeek +++ b/testing/external/scripts/testing-setup.zeek @@ -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 diff --git a/testing/scripts/coverage-calc b/testing/scripts/coverage-calc index df12e0c86f..3645f57144 100755 --- a/testing/scripts/coverage-calc +++ b/testing/scripts/coverage-calc @@ -1,12 +1,12 @@ #! /usr/bin/env python -# This script aggregates many files containing Bro script coverage information +# This script aggregates many files containing Zeek script coverage information # into a single file and reports the overall coverage information. Usage: # # coverage-calc