Use .zeek file suffix in unit tests

testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek

@@ -10,7 +10,7 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek

@@ -10,7 +10,7 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/cluster/forwarding.zeek

@@ -16,7 +16,7 @@
 # @TEST-EXEC: btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff worker-2/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek

@@ -11,7 +11,7 @@
 # @TEST-EXEC: btest-diff logger-1/test.log
 # @TEST-EXEC: btest-diff logger-2/test.log
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::manager_is_logger = F;
 
 redef Cluster::nodes = {

testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek

@@ -19,7 +19,7 @@
 # @TEST-EXEC: btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff worker-2/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::manager_is_logger = F;
 redef Cluster::nodes = {
 	["logger-1"] = [$node_type=Cluster::LOGGER,   $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],

testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek

@@ -16,7 +16,7 @@
 # @TEST-EXEC: btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff worker-2/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek

@@ -10,7 +10,7 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek

@@ -12,7 +12,7 @@
 # @TEST-EXEC: btest-diff proxy-1/.stdout
 # @TEST-EXEC: btest-diff proxy-2/.stdout
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["proxy-1"] = [$node_type=Cluster::PROXY,     $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],

testing/btest/scripts/base/frameworks/config/basic_cluster.zeek

@@ -15,7 +15,7 @@
 @load base/frameworks/config
 
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],

testing/btest/scripts/base/frameworks/config/cluster_resend.zeek

@@ -19,7 +19,7 @@
 @load base/frameworks/config
 
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],

testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek

@@ -15,7 +15,7 @@
 @load base/frameworks/config
 
 
-@TEST-START-FILE cluster-layout.bro
+@TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],

testing/btest/scripts/base/frameworks/control/configuration_update.zeek

@@ -7,7 +7,7 @@
 
 const test_var = "ORIGINAL VALUE (this should be printed out first)" &redef;
 
-@TEST-START-FILE test-redef.bro
+@TEST-START-FILE test-redef.zeek
 redef test_var = "NEW VALUE (this should be printed out second)";
 @TEST-END-FILE
 

testing/btest/scripts/base/frameworks/control/id_value.zeek

@@ -8,7 +8,7 @@
 # This value shouldn't ever be printed to the controllers stdout.
 const test_var = "Original value" &redef;
 
-@TEST-START-FILE only-for-controllee.bro
+@TEST-START-FILE only-for-controllee.zeek
 # This is only loaded on the controllee, but it's sent to the controller 
 # and should be printed there.
 redef test_var = "This is the value from the controllee";

testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 
 redef test_print_file_data_events = T;

testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT >get.out
+# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT >get.out
 # @TEST-EXEC: btest-diff get.out
 
 redef test_file_analysis_source = "HTTP";

testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: btest-bg-run bro bro -r $TRACES/http/206_example_b.pcap $SCRIPTS/file-analysis-test.bro %INPUT
+# @TEST-EXEC: btest-bg-run bro bro -r $TRACES/http/206_example_b.pcap $SCRIPTS/file-analysis-test.zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 8
 # @TEST-EXEC: btest-diff bro/.stdout
 

testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT >get.out
+# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT >get.out
 # @TEST-EXEC: btest-diff get.out
 # @TEST-EXEC: test ! -s Cx92a0ym5R8-file
 

testing/btest/scripts/base/frameworks/file-analysis/ftp.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/ftp/retr.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/ftp/retr.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff thefile
 

testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek

@@ -1,5 +1,5 @@
-# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT c=1 >get.out
-# @TEST-EXEC: bro -r $TRACES/http/get-gzip.trace $SCRIPTS/file-analysis-test.bro %INPUT c=2 >get-gzip.out
+# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT c=1 >get.out
+# @TEST-EXEC: bro -r $TRACES/http/get-gzip.trace $SCRIPTS/file-analysis-test.zeek %INPUT c=2 >get-gzip.out
 # @TEST-EXEC: btest-diff get.out
 # @TEST-EXEC: btest-diff get-gzip.out
 # @TEST-EXEC: btest-diff 1-file

testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/multipart.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/http/multipart.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff 1-file
 # @TEST-EXEC: btest-diff 2-file

testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.zeek

@@ -1,14 +1,14 @@
-# @TEST-EXEC: bro -r $TRACES/http/206_example_a.pcap $SCRIPTS/file-analysis-test.bro %INPUT >a.out
+# @TEST-EXEC: bro -r $TRACES/http/206_example_a.pcap $SCRIPTS/file-analysis-test.zeek %INPUT >a.out
 # @TEST-EXEC: btest-diff a.out
 # @TEST-EXEC: wc -c file-0 | sed 's/^[ \t]* //g' >a.size
 # @TEST-EXEC: btest-diff a.size
 
-# @TEST-EXEC: bro -r $TRACES/http/206_example_b.pcap $SCRIPTS/file-analysis-test.bro %INPUT >b.out
+# @TEST-EXEC: bro -r $TRACES/http/206_example_b.pcap $SCRIPTS/file-analysis-test.zeek %INPUT >b.out
 # @TEST-EXEC: btest-diff b.out
 # @TEST-EXEC: wc -c file-0 | sed 's/^[ \t]* //g' >b.size
 # @TEST-EXEC: btest-diff b.size
 
-# @TEST-EXEC: bro -r $TRACES/http/206_example_c.pcap $SCRIPTS/file-analysis-test.bro %INPUT >c.out
+# @TEST-EXEC: bro -r $TRACES/http/206_example_c.pcap $SCRIPTS/file-analysis-test.zeek %INPUT >c.out
 # @TEST-EXEC: btest-diff c.out
 # @TEST-EXEC: wc -c file-0 | sed 's/^[ \t]* //g' >c.size
 # @TEST-EXEC: btest-diff c.size

testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/pipelined-requests.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/http/pipelined-requests.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff 1-file
 # @TEST-EXEC: btest-diff 2-file

testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/post.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/http/post.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff 1-file
 # @TEST-EXEC: btest-diff 2-file

testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: btest-bg-run bro bro -b $SCRIPTS/file-analysis-test.bro %INPUT
+# @TEST-EXEC: btest-bg-run bro bro -b $SCRIPTS/file-analysis-test.zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 8
 # @TEST-EXEC: btest-diff bro/.stdout
 # @TEST-EXEC: diff -q bro/FK8WqY1Q9U1rVxnDge-file input.log

testing/btest/scripts/base/frameworks/file-analysis/irc.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/irc-dcc-send.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/irc-dcc-send.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff thefile
 

testing/btest/scripts/base/frameworks/file-analysis/logging.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT
+# @TEST-EXEC: bro -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT
 # @TEST-EXEC: btest-diff files.log
 
 redef test_file_analysis_source = "HTTP";

testing/btest/scripts/base/frameworks/file-analysis/smtp.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC: bro -r $TRACES/smtp.trace $SCRIPTS/file-analysis-test.bro %INPUT >out
+# @TEST-EXEC: bro -r $TRACES/smtp.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff thefile0
 # @TEST-EXEC: btest-diff thefile1

testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek

@@ -19,7 +19,7 @@
 127.0.3.3	value
 @TEST-END-FILE
 
-@load path-prefix-common-table.bro
+@load path-prefix-common-table.zeek
 redef InputAscii::path_prefix = "@path_prefix@";
 
 event bro_init()
@@ -32,7 +32,7 @@ event bro_init()
 #
 # The same test, but using event streams for input.
 
-@load path-prefix-common-event.bro
+@load path-prefix-common-event.zeek
 redef InputAscii::path_prefix = "@path_prefix@";
 
 event bro_init()
@@ -45,7 +45,7 @@ event bro_init()
 #
 # The same test again, but using file analysis w/ binary readers.
 
-@load path-prefix-common-analysis.bro
+@load path-prefix-common-analysis.zeek
 redef InputBinary::path_prefix = "@path_prefix@";
 
 event bro_init()

testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek

@@ -13,7 +13,7 @@
 127.0.4.3	value
 @TEST-END-FILE
 
-@load path-prefix-common-table.bro
+@load path-prefix-common-table.zeek
 redef InputAscii::path_prefix = "/this/does/not/exist";
 
 event bro_init()
@@ -26,7 +26,7 @@ event bro_init()
 #
 # The same test, but using event streams for input.
 
-@load path-prefix-common-event.bro
+@load path-prefix-common-event.zeek
 redef InputAscii::path_prefix = "/this/does/not/exist";
 
 event bro_init()
@@ -39,7 +39,7 @@ event bro_init()
 #
 # The same test again, but using file analysis w/ binary readers.
 
-@load path-prefix-common-analysis.bro
+@load path-prefix-common-analysis.zeek
 redef InputBinary::path_prefix = "/this/does/not/exist";
 
 event bro_init()

testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek

@@ -11,7 +11,7 @@
 127.0.0.3	value
 @TEST-END-FILE
 
-@load path-prefix-common-table.bro
+@load path-prefix-common-table.zeek
 
 event bro_init()
 	{
@@ -23,7 +23,7 @@ event bro_init()
 #
 # The same test, but using event streams for input.
 
-@load path-prefix-common-event.bro
+@load path-prefix-common-event.zeek
 
 event bro_init()
 	{
@@ -35,7 +35,7 @@ event bro_init()
 #
 # The same test again, but using file analysis w/ binary readers.
 
-@load path-prefix-common-analysis.bro
+@load path-prefix-common-analysis.zeek
 
 event bro_init()
 	{

testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek

@@ -13,7 +13,7 @@
 127.0.1.3	value
 @TEST-END-FILE
 
-@load path-prefix-common-table.bro
+@load path-prefix-common-table.zeek
 redef InputAscii::path_prefix = "alternative";
 
 event bro_init()
@@ -26,7 +26,7 @@ event bro_init()
 #
 # The same test, but using event streams for input.
 
-@load path-prefix-common-event.bro
+@load path-prefix-common-event.zeek
 redef InputAscii::path_prefix = "alternative";
 
 event bro_init()
@@ -39,7 +39,7 @@ event bro_init()
 #
 # The same test again, but using file analysis w/ binary readers.
 
-@load path-prefix-common-analysis.bro
+@load path-prefix-common-analysis.zeek
 redef InputBinary::path_prefix = "alternative";
 
 event bro_init()