diff --git a/CHANGES b/CHANGES index 8ca429af4c..d9146fbb9b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-225 | 2019-04-16 16:07:49 -0700 + + * Use .zeek file suffix in unit tests (Jon Siwek, Corelight) + 2.6-223 | 2019-04-16 11:56:00 -0700 * Update tests and baselines due to renaming all scripts (Daniel Thayer) diff --git a/VERSION b/VERSION index 439c8eab2d..23ad9f21a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-223 +2.6-225 diff --git a/testing/btest/Baseline/bifs.to_double_from_string/error b/testing/btest/Baseline/bifs.to_double_from_string/error index d6c6c0c75b..ed0ae3a1f9 100644 --- a/testing/btest/Baseline/bifs.to_double_from_string/error +++ b/testing/btest/Baseline/bifs.to_double_from_string/error @@ -1,2 +1,2 @@ -error in /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.bro, line 7 and /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.bro, line 15: bad conversion to double (to_double(d) and NotADouble) -error in /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.bro, line 7 and /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.bro, line 16: bad conversion to double (to_double(d) and ) +error in /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.zeek, line 7 and /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.zeek, line 15: bad conversion to double (to_double(d) and NotADouble) +error in /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.zeek, line 7 and /da/home/robin/bro/master/testing/btest/.tmp/bifs.to_double_from_string/to_double_from_string.zeek, line 16: bad conversion to double (to_double(d) and ) diff --git a/testing/btest/Baseline/core.div-by-zero/out b/testing/btest/Baseline/core.div-by-zero/out index dca1894e32..702d00c156 100644 --- a/testing/btest/Baseline/core.div-by-zero/out +++ b/testing/btest/Baseline/core.div-by-zero/out @@ -1,5 +1,5 @@ -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.bro, line 6: division by zero (a / b) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.bro, line 11: division by zero (a / b) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.bro, line 16: division by zero (a / b) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.bro, line 21: modulo by zero (a % b) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.bro, line 26: modulo by zero (a % b) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.zeek, line 6: division by zero (a / b) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.zeek, line 11: division by zero (a / b) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.zeek, line 16: division by zero (a / b) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.zeek, line 21: modulo by zero (a % b) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.div-by-zero/div-by-zero.zeek, line 26: modulo by zero (a % b) diff --git a/testing/btest/Baseline/core.expr-exception/reporter.log b/testing/btest/Baseline/core.expr-exception/reporter.log index f546142dca..e2e1a4103f 100644 --- a/testing/btest/Baseline/core.expr-exception/reporter.log +++ b/testing/btest/Baseline/core.expr-exception/reporter.log @@ -6,13 +6,13 @@ #open 2011-03-18-19-06-08 #fields ts level message location #types time enum string string -1300475168.783842 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.915940 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.916118 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.918295 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.952193 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.952228 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.954761 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475168.962628 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 -1300475169.780331 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.bro, line 10 +1300475168.783842 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.915940 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.916118 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.918295 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.952193 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.952228 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.954761 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475168.962628 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 +1300475169.780331 Reporter::ERROR field value missing (c$ftp) /da/home/robin/bro/master/testing/btest/.tmp/core.expr-exception/expr-exception.zeek, line 10 #close 2011-03-18-19-06-13 diff --git a/testing/btest/Baseline/core.init-error/out b/testing/btest/Baseline/core.init-error/out index 50aea70a75..3079bdfcbd 100644 --- a/testing/btest/Baseline/core.init-error/out +++ b/testing/btest/Baseline/core.init-error/out @@ -1,4 +1,4 @@ -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/core.init-error/init-error.bro, line 15: no such index (v[10]) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/core.init-error/init-error.zeek, line 15: no such index (v[10]) fatal error: errors occurred while initializing 1st event 2nd event diff --git a/testing/btest/Baseline/core.old_comm_usage/out b/testing/btest/Baseline/core.old_comm_usage/out index 219a2f5620..cf4820d82e 100644 --- a/testing/btest/Baseline/core.old_comm_usage/out +++ b/testing/btest/Baseline/core.old_comm_usage/out @@ -1,2 +1,2 @@ -warning in /Users/jon/projects/bro/bro/testing/btest/.tmp/core.old_comm_usage/old_comm_usage.bro, line 6: deprecated (terminate_communication) +warning in /Users/jon/projects/bro/bro/testing/btest/.tmp/core.old_comm_usage/old_comm_usage.zeek, line 6: deprecated (terminate_communication) fatal error: Detected old, deprecated communication system usages that will not work unless you explicitly take action to initizialize and set up the old comm. system. Set the 'old_comm_usage_is_ok' flag to bypass this error if you've taken such actions, but the suggested solution is to port scripts to use the new Broker API. diff --git a/testing/btest/Baseline/core.option-errors-2/.stderr b/testing/btest/Baseline/core.option-errors-2/.stderr index 90011d5c85..ef9fb3ae4e 100644 --- a/testing/btest/Baseline/core.option-errors-2/.stderr +++ b/testing/btest/Baseline/core.option-errors-2/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors-2/option-errors.bro, line 2: option variable must be initialized (testbool) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors-2/option-errors.zeek, line 2: option variable must be initialized (testbool) diff --git a/testing/btest/Baseline/core.option-errors-3/.stderr b/testing/btest/Baseline/core.option-errors-3/.stderr index ffe699c739..a3c52db614 100644 --- a/testing/btest/Baseline/core.option-errors-3/.stderr +++ b/testing/btest/Baseline/core.option-errors-3/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors-3/option-errors.bro, line 3: option is not a modifiable lvalue (testopt) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors-3/option-errors.zeek, line 3: option is not a modifiable lvalue (testopt) diff --git a/testing/btest/Baseline/core.option-errors/.stderr b/testing/btest/Baseline/core.option-errors/.stderr index 27a73e180d..3e5dc6c86c 100644 --- a/testing/btest/Baseline/core.option-errors/.stderr +++ b/testing/btest/Baseline/core.option-errors/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors/option-errors.bro, line 4: no type given (testbool) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-errors/option-errors.zeek, line 4: no type given (testbool) diff --git a/testing/btest/Baseline/core.option-runtime-errors-10/.stderr b/testing/btest/Baseline/core.option-runtime-errors-10/.stderr index 3b4cf422f5..6f385fbb29 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-10/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-10/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-10/option-runtime-errors.bro, line 7: ID 'A' is not an option (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-10/option-runtime-errors.zeek, line 7: ID 'A' is not an option (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-11/.stderr b/testing/btest/Baseline/core.option-runtime-errors-11/.stderr index 8fd7de5d2e..b0f531df70 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-11/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-11/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-11/option-runtime-errors.bro, line 4: Option::on_change needs function argument; got 'count' for ID 'A' (Option::set_change_handler(A, A, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-11/option-runtime-errors.zeek, line 4: Option::on_change needs function argument; got 'count' for ID 'A' (Option::set_change_handler(A, A, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-12/.stderr b/testing/btest/Baseline/core.option-runtime-errors-12/.stderr index 635b287c6b..bd38eea092 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-12/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-12/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-12/option-runtime-errors.bro, line 7: Third argument of passed function has to be string in Option::on_change for ID 'A'; got 'count' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-12/option-runtime-errors.zeek, line 7: Third argument of passed function has to be string in Option::on_change for ID 'A'; got 'count' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-13/.stderr b/testing/btest/Baseline/core.option-runtime-errors-13/.stderr index 7b58339d8b..738cfff6e5 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-13/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-13/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-13/option-runtime-errors.bro, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 4 (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-13/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 4 (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-2/.stderr b/testing/btest/Baseline/core.option-runtime-errors-2/.stderr index ad027f69db..25d102b9f7 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-2/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-2/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-2/option-runtime-errors.bro, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, hi, )) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-2/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, hi, )) diff --git a/testing/btest/Baseline/core.option-runtime-errors-3/.stderr b/testing/btest/Baseline/core.option-runtime-errors-3/.stderr index 2c98b170b7..d784841888 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-3/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-3/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-3/option-runtime-errors.bro, line 3: ID 'A' is not an option (Option::set(A, 6, )) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-3/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, 6, )) diff --git a/testing/btest/Baseline/core.option-runtime-errors-4/.stderr b/testing/btest/Baseline/core.option-runtime-errors-4/.stderr index a965ddd3ae..ec76dc4be4 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-4/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-4/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-4/option-runtime-errors.bro, line 7: Second argument of passed function has to be count in Option::on_change for ID 'A'; got 'bool' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-4/option-runtime-errors.zeek, line 7: Second argument of passed function has to be count in Option::on_change for ID 'A'; got 'bool' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-5/.stderr b/testing/btest/Baseline/core.option-runtime-errors-5/.stderr index d931ff062a..4130f865d6 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-5/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-5/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-5/option-runtime-errors.bro, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 1 (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-5/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 1 (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-6/.stderr b/testing/btest/Baseline/core.option-runtime-errors-6/.stderr index 593c239155..ee01ccfb1f 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-6/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-6/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-6/option-runtime-errors.bro, line 7: Passed function needs to return type 'count' for ID 'A'; got 'bool' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-6/option-runtime-errors.zeek, line 7: Passed function needs to return type 'count' for ID 'A'; got 'bool' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-7/.stderr b/testing/btest/Baseline/core.option-runtime-errors-7/.stderr index 57f7b5c21b..6d5f9f4595 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-7/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-7/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-7/option-runtime-errors.bro, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-7/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-8/.stderr b/testing/btest/Baseline/core.option-runtime-errors-8/.stderr index 2e7735f433..90cec05f47 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-8/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-8/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-8/option-runtime-errors.bro, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-8/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors-9/.stderr b/testing/btest/Baseline/core.option-runtime-errors-9/.stderr index a95196eef7..f2ce6efd83 100644 --- a/testing/btest/Baseline/core.option-runtime-errors-9/.stderr +++ b/testing/btest/Baseline/core.option-runtime-errors-9/.stderr @@ -1 +1 @@ -error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-9/option-runtime-errors.bro, line 5: Could not find ID named 'A' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) +error in /Users/johanna/corelight/bro/testing/btest/.tmp/core.option-runtime-errors-9/option-runtime-errors.zeek, line 5: Could not find ID named 'A' (Option::set_change_handler(A, option_changed, (coerce 0 to int))) diff --git a/testing/btest/Baseline/core.option-runtime-errors/.stderr b/testing/btest/Baseline/core.option-runtime-errors/.stderr index f3ad46d382..0d4da12312 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.bro, 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 8: Could not find ID named 'B' (Option::set(B, 6, )) diff --git a/testing/btest/Baseline/core.reporter-error-in-handler/output b/testing/btest/Baseline/core.reporter-error-in-handler/output index ab5309b659..85014657a3 100644 --- a/testing/btest/Baseline/core.reporter-error-in-handler/output +++ b/testing/btest/Baseline/core.reporter-error-in-handler/output @@ -1,3 +1,3 @@ -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter-error-in-handler/reporter-error-in-handler.bro, line 28: no such index (a[1]) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter-error-in-handler/reporter-error-in-handler.bro, line 22: no such index (a[2]) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter-error-in-handler/reporter-error-in-handler.zeek, line 28: no such index (a[1]) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter-error-in-handler/reporter-error-in-handler.zeek, line 22: no such index (a[2]) 1st error printed on script level diff --git a/testing/btest/Baseline/core.reporter-fmt-strings/output b/testing/btest/Baseline/core.reporter-fmt-strings/output index bbd76f3447..4e31478caa 100644 --- a/testing/btest/Baseline/core.reporter-fmt-strings/output +++ b/testing/btest/Baseline/core.reporter-fmt-strings/output @@ -1 +1 @@ -error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-fmt-strings/reporter-fmt-strings.bro, line 9: not an event (dont_interpret_this(%s)) +error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-fmt-strings/reporter-fmt-strings.zeek, line 9: not an event (dont_interpret_this(%s)) diff --git a/testing/btest/Baseline/core.reporter-parse-error/output b/testing/btest/Baseline/core.reporter-parse-error/output index 76535f75d1..4dd922fd24 100644 --- a/testing/btest/Baseline/core.reporter-parse-error/output +++ b/testing/btest/Baseline/core.reporter-parse-error/output @@ -1 +1 @@ -error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-parse-error/reporter-parse-error.bro, line 7: unknown identifier TESTFAILURE, at or near "TESTFAILURE" +error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-parse-error/reporter-parse-error.zeek, line 7: unknown identifier TESTFAILURE, at or near "TESTFAILURE" diff --git a/testing/btest/Baseline/core.reporter-runtime-error/output b/testing/btest/Baseline/core.reporter-runtime-error/output index 695e2e2f81..7e0ab11845 100644 --- a/testing/btest/Baseline/core.reporter-runtime-error/output +++ b/testing/btest/Baseline/core.reporter-runtime-error/output @@ -1,2 +1,2 @@ -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/core.reporter-runtime-error/reporter-runtime-error.bro, line 12: no such index (a[1]) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/core.reporter-runtime-error/reporter-runtime-error.zeek, line 12: no such index (a[1]) fatal error: failed to execute script statements at top-level scope diff --git a/testing/btest/Baseline/core.reporter-type-mismatch/output b/testing/btest/Baseline/core.reporter-type-mismatch/output index 23eefd13e8..d54e6e2b9b 100644 --- a/testing/btest/Baseline/core.reporter-type-mismatch/output +++ b/testing/btest/Baseline/core.reporter-type-mismatch/output @@ -1,3 +1,3 @@ -error in string and /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.bro, line 11: arithmetic mixed with non-arithmetic (string and 42) -error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.bro, line 11 and string: type mismatch (42 and string) -error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.bro, line 11: argument type mismatch in event invocation (foo(42)) +error in string and /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.zeek, line 11: arithmetic mixed with non-arithmetic (string and 42) +error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.zeek, line 11 and string: type mismatch (42 and string) +error in /da/home/robin/bro/master/testing/btest/.tmp/core.reporter-type-mismatch/reporter-type-mismatch.zeek, line 11: argument type mismatch in event invocation (foo(42)) diff --git a/testing/btest/Baseline/core.reporter/logger-test.log b/testing/btest/Baseline/core.reporter/logger-test.log index 4ee0d03341..1dc58b65cd 100644 --- a/testing/btest/Baseline/core.reporter/logger-test.log +++ b/testing/btest/Baseline/core.reporter/logger-test.log @@ -1,6 +1,6 @@ -reporter_info|init test-info|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 8|0.000000 -reporter_warning|init test-warning|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 9|0.000000 -reporter_error|init test-error|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 10|0.000000 -reporter_info|done test-info|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 15|0.000000 -reporter_warning|done test-warning|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 16|0.000000 -reporter_error|done test-error|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 17|0.000000 +reporter_info|init test-info|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 8|0.000000 +reporter_warning|init test-warning|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 9|0.000000 +reporter_error|init test-error|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 10|0.000000 +reporter_info|done test-info|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 15|0.000000 +reporter_warning|done test-warning|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 16|0.000000 +reporter_error|done test-error|/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 17|0.000000 diff --git a/testing/btest/Baseline/core.reporter/output b/testing/btest/Baseline/core.reporter/output index 24a12f9679..12069545ba 100644 --- a/testing/btest/Baseline/core.reporter/output +++ b/testing/btest/Baseline/core.reporter/output @@ -1,9 +1,9 @@ -/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 52: pre test-info -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 53: pre test-warning -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 54: pre test-error -/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 8: init test-info -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 9: init test-warning -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 10: init test-error -/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 15: done test-info -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 16: done test-warning -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.bro, line 17: done test-error +/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 52: pre test-info +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 53: pre test-warning +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 54: pre test-error +/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 8: init test-info +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 9: init test-warning +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 10: init test-error +/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 15: done test-info +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 16: done test-warning +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/core.reporter/reporter.zeek, line 17: done test-error diff --git a/testing/btest/Baseline/core.when-interpreter-exceptions/bro.output b/testing/btest/Baseline/core.when-interpreter-exceptions/bro.output index 27a90d137c..04236c9f83 100644 --- a/testing/btest/Baseline/core.when-interpreter-exceptions/bro.output +++ b/testing/btest/Baseline/core.when-interpreter-exceptions/bro.output @@ -1,7 +1,7 @@ -expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.bro, line 47: field value missing (myrecord$notset) -expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.bro, line 91: field value missing (myrecord$notset) -expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.bro, line 72: field value missing (myrecord$notset) -expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.bro, line 103: field value missing (myrecord$notset) +expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.zeek, line 47: field value missing (myrecord$notset) +expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.zeek, line 91: field value missing (myrecord$notset) +expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.zeek, line 72: field value missing (myrecord$notset) +expression error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/core.when-interpreter-exceptions/when-interpreter-exceptions.zeek, line 103: field value missing (myrecord$notset) received termination signal [f(F)] f() done, no exception, T diff --git a/testing/btest/Baseline/coverage.coverage-blacklist/output b/testing/btest/Baseline/coverage.coverage-blacklist/output index c54e4283b2..e27574face 100644 --- a/testing/btest/Baseline/coverage.coverage-blacklist/output +++ b/testing/btest/Baseline/coverage.coverage-blacklist/output @@ -1,5 +1,5 @@ -1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.bro, line 13 print cover me; -1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.bro, line 17 print always executed; -0 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.bro, line 26 print also impossible, but included in code coverage analysis; -1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.bro, line 29 print success; -1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.bro, line 5 print first; +1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.zeek, line 13 print cover me; +1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.zeek, line 17 print always executed; +0 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.zeek, line 26 print also impossible, but included in code coverage analysis; +1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.zeek, line 29 print success; +1 /da/home/robin/bro/master/testing/btest/.tmp/coverage.coverage-blacklist/coverage-blacklist.zeek, line 5 print first; diff --git a/testing/btest/Baseline/language.at-deprecated/.stderr b/testing/btest/Baseline/language.at-deprecated/.stderr index 4668f2d7bf..97dc7ea331 100644 --- a/testing/btest/Baseline/language.at-deprecated/.stderr +++ b/testing/btest/Baseline/language.at-deprecated/.stderr @@ -1,3 +1,3 @@ -warning in ./foo.bro, line 1: deprecated script loaded from command line arguments -warning in ./bar.bro, line 1: deprecated script loaded from ./foo.bro:2 "Use '@load qux.bro' instead" -warning in ./baz.bro, line 1: deprecated script loaded from ./foo.bro:3 +warning in ./foo.zeek, line 1: deprecated script loaded from command line arguments +warning in ./bar.zeek, line 1: deprecated script loaded from ./foo.zeek:2 "Use '@load qux' instead" +warning in ./baz.zeek, line 1: deprecated script loaded from ./foo.zeek:3 diff --git a/testing/btest/Baseline/language.at-filename/out b/testing/btest/Baseline/language.at-filename/out index 12cfb152d9..23b37ef249 100644 --- a/testing/btest/Baseline/language.at-filename/out +++ b/testing/btest/Baseline/language.at-filename/out @@ -1 +1 @@ -at-filename.bro +at-filename.zeek diff --git a/testing/btest/Baseline/language.at-if-invalid/out b/testing/btest/Baseline/language.at-if-invalid/out index 63b93a3cf8..0214a8d2f8 100644 --- a/testing/btest/Baseline/language.at-if-invalid/out +++ b/testing/btest/Baseline/language.at-if-invalid/out @@ -1,4 +1,4 @@ -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.bro, line 28: referencing a local name in @if (xyz) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.bro, line 28: invalid expression in @if (F && foo(xyz)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.bro, line 36: referencing a local name in @if (local_true_condition) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.bro, line 36: invalid expression in @if (T && TRUE_CONDITION && local_true_condition) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.zeek, line 28: referencing a local name in @if (xyz) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.zeek, line 28: invalid expression in @if (F && foo(xyz)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.zeek, line 36: referencing a local name in @if (local_true_condition) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-if-invalid/at-if-invalid.zeek, line 36: invalid expression in @if (T && TRUE_CONDITION && local_true_condition) diff --git a/testing/btest/Baseline/language.attr-default-global-set-error/out b/testing/btest/Baseline/language.attr-default-global-set-error/out index c784bb683b..6f3fd63d4f 100644 --- a/testing/btest/Baseline/language.attr-default-global-set-error/out +++ b/testing/btest/Baseline/language.attr-default-global-set-error/out @@ -1,2 +1,2 @@ -error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.bro, line 4: arithmetic mixed with non-arithmetic (set[string] and 0) -error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.bro, line 4: &default value has inconsistent type (0 and set[string]) +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.zeek, line 4: arithmetic mixed with non-arithmetic (set[string] and 0) +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.zeek, line 4: &default value has inconsistent type (0 and set[string]) diff --git a/testing/btest/Baseline/language.common-mistakes/1.out b/testing/btest/Baseline/language.common-mistakes/1.out index 8070f84644..6c5428605f 100644 --- a/testing/btest/Baseline/language.common-mistakes/1.out +++ b/testing/btest/Baseline/language.common-mistakes/1.out @@ -1,4 +1,4 @@ -expression error in ./1.bro, line 9: field value missing (mr$f) +expression error in ./1.zeek, line 9: field value missing (mr$f) bar start foo start other bro_init diff --git a/testing/btest/Baseline/language.common-mistakes/2.out b/testing/btest/Baseline/language.common-mistakes/2.out index dd62af107c..dbf4ed7ae6 100644 --- a/testing/btest/Baseline/language.common-mistakes/2.out +++ b/testing/btest/Baseline/language.common-mistakes/2.out @@ -1,2 +1,2 @@ -expression error in ./2.bro, line 7: no such index (t[nope]) +expression error in ./2.zeek, line 7: no such index (t[nope]) in foo diff --git a/testing/btest/Baseline/language.common-mistakes/3.out b/testing/btest/Baseline/language.common-mistakes/3.out index d914d399a7..62cb349e7d 100644 --- a/testing/btest/Baseline/language.common-mistakes/3.out +++ b/testing/btest/Baseline/language.common-mistakes/3.out @@ -1,2 +1,2 @@ -expression error in ./3.bro, line 5: type-checking failed in vector append (v += ok) +expression error in ./3.zeek, line 5: type-checking failed in vector append (v += ok) in foo diff --git a/testing/btest/Baseline/language.const/invalid.stderr b/testing/btest/Baseline/language.const/invalid.stderr index b08c472708..5b6e120f8e 100644 --- a/testing/btest/Baseline/language.const/invalid.stderr +++ b/testing/btest/Baseline/language.const/invalid.stderr @@ -1,13 +1,13 @@ -error in ./invalid.bro, line 15: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 16: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 17: const is not a modifiable lvalue (bar) -error in ./invalid.bro, line 17: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 18: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 19: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 20: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 22: const is not a modifiable lvalue (foo) -error in ./invalid.bro, line 25: const is not a modifiable lvalue (bar) -error in ./invalid.bro, line 26: const is not a modifiable lvalue (baz) -error in ./invalid.bro, line 27: const is not a modifiable lvalue (bar) -error in ./invalid.bro, line 28: const is not a modifiable lvalue (baz) -error in ./invalid.bro, line 33: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 15: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 16: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 17: const is not a modifiable lvalue (bar) +error in ./invalid.zeek, line 17: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 18: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 19: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 20: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 22: const is not a modifiable lvalue (foo) +error in ./invalid.zeek, line 25: const is not a modifiable lvalue (bar) +error in ./invalid.zeek, line 26: const is not a modifiable lvalue (baz) +error in ./invalid.zeek, line 27: const is not a modifiable lvalue (bar) +error in ./invalid.zeek, line 28: const is not a modifiable lvalue (baz) +error in ./invalid.zeek, line 33: const is not a modifiable lvalue (foo) diff --git a/testing/btest/Baseline/language.deprecated/out b/testing/btest/Baseline/language.deprecated/out index 5bdf87a62b..3126b1e78b 100644 --- a/testing/btest/Baseline/language.deprecated/out +++ b/testing/btest/Baseline/language.deprecated/out @@ -1,22 +1,22 @@ -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 30: deprecated (ONE) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 31: deprecated (TWO) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 33: deprecated (GREEN) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 34: deprecated (BLUE) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 36: deprecated (blah) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 40: deprecated (my_event) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 41: deprecated (my_event) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 42: deprecated (my_hook) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 44: deprecated (my_record$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 45: deprecated (my_record$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 46: deprecated (my_record$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 48: deprecated (my_record?$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 49: deprecated (my_record$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 52: deprecated (my_record$b) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 55: deprecated (my_event) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 60: deprecated (my_hook) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 65: deprecated (blah) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 74: deprecated (dont_use_me) -warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.bro, line 79: deprecated (dont_use_me_either) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 30: deprecated (ONE) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 31: deprecated (TWO) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 33: deprecated (GREEN) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 34: deprecated (BLUE) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 36: deprecated (blah) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 40: deprecated (my_event) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 41: deprecated (my_event) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 42: deprecated (my_hook) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 44: deprecated (my_record$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 45: deprecated (my_record$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 46: deprecated (my_record$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 48: deprecated (my_record?$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 49: deprecated (my_record$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 52: deprecated (my_record$b) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 55: deprecated (my_event) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 60: deprecated (my_hook) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 65: deprecated (blah) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 74: deprecated (dont_use_me) +warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 79: deprecated (dont_use_me_either) ZERO ONE TWO diff --git a/testing/btest/Baseline/language.eof-parse-errors/output1 b/testing/btest/Baseline/language.eof-parse-errors/output1 index 47a1c328e3..0fd8331175 100644 --- a/testing/btest/Baseline/language.eof-parse-errors/output1 +++ b/testing/btest/Baseline/language.eof-parse-errors/output1 @@ -1 +1 @@ -error: syntax error, at end of file ./a.bro +error: syntax error, at end of file ./a.zeek diff --git a/testing/btest/Baseline/language.eof-parse-errors/output2 b/testing/btest/Baseline/language.eof-parse-errors/output2 index 6f382c2a12..b7a433b9b0 100644 --- a/testing/btest/Baseline/language.eof-parse-errors/output2 +++ b/testing/btest/Baseline/language.eof-parse-errors/output2 @@ -1 +1 @@ -error in ./b.bro, line 1: syntax error, at or near "module" or end of file ./a.bro +error in ./b.zeek, line 1: syntax error, at or near "module" or end of file ./a.zeek diff --git a/testing/btest/Baseline/language.event-local-var/out b/testing/btest/Baseline/language.event-local-var/out index 2802c45d69..465a97d5cf 100644 --- a/testing/btest/Baseline/language.event-local-var/out +++ b/testing/btest/Baseline/language.event-local-var/out @@ -1 +1 @@ -error in /home/jgras/devel/bro/testing/btest/.tmp/language.event-local-var/event-local-var.bro, line 15: local identifier "v" cannot be used to reference an event, at or near ")" +error in /home/jgras/devel/bro/testing/btest/.tmp/language.event-local-var/event-local-var.zeek, line 15: local identifier "v" cannot be used to reference an event, at or near ")" diff --git a/testing/btest/Baseline/language.expire-expr-error/output b/testing/btest/Baseline/language.expire-expr-error/output index dfa0bf64c3..5bc22b8202 100644 --- a/testing/btest/Baseline/language.expire-expr-error/output +++ b/testing/btest/Baseline/language.expire-expr-error/output @@ -1,2 +1,2 @@ -expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-expr-error/expire-expr-error.bro, line 8: no such index (x[kaputt]) +expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-expr-error/expire-expr-error.zeek, line 8: no such index (x[kaputt]) received termination signal diff --git a/testing/btest/Baseline/language.expire-func-undef/output b/testing/btest/Baseline/language.expire-func-undef/output index cf869bbe6b..fb783261be 100644 --- a/testing/btest/Baseline/language.expire-func-undef/output +++ b/testing/btest/Baseline/language.expire-func-undef/output @@ -1,20 +1,20 @@ -1299470395.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299470405.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299473995.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299474005.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299477595.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299477605.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299481195.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299481205.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299484795.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299484805.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299488395.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299488405.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299491995.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299492005.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299495595.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299495605.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299499195.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299499205.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) -1299502795.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.bro, line 12: value used but not set (segfault::scan_summary) +1299470395.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299470405.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299473995.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299474005.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299477595.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299477605.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299481195.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299481205.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299484795.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299484805.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299488395.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299488405.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299491995.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299492005.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299495595.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299495605.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299499195.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299499205.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) +1299502795.000000 expression error in /home/robin/bro/master/testing/btest/.tmp/language.expire-func-undef/expire-func-undef.zeek, line 12: value used but not set (segfault::scan_summary) orig: 10.0.0.2: peers: {\x0a\x0910.0.0.3\x0a} diff --git a/testing/btest/Baseline/language.expire-type-error/out b/testing/btest/Baseline/language.expire-type-error/out index c0987a6341..1050304b06 100644 --- a/testing/btest/Baseline/language.expire-type-error/out +++ b/testing/btest/Baseline/language.expire-type-error/out @@ -1 +1 @@ -error in /home/robin/bro/master/testing/btest/.tmp/language.expire-type-error/expire-type-error.bro, line 4: expiration interval has wrong type (kaputt) +error in /home/robin/bro/master/testing/btest/.tmp/language.expire-type-error/expire-type-error.zeek, line 4: expiration interval has wrong type (kaputt) diff --git a/testing/btest/Baseline/language.hook_calls/invalid.out b/testing/btest/Baseline/language.hook_calls/invalid.out index 3412c1900e..fdfd719cd8 100644 --- a/testing/btest/Baseline/language.hook_calls/invalid.out +++ b/testing/btest/Baseline/language.hook_calls/invalid.out @@ -1,10 +1,10 @@ -error in ./invalid.bro, line 9: hook cannot be called directly, use hook operator (myhook) -warning in ./invalid.bro, line 9: expression value ignored (myhook(3)) -error in ./invalid.bro, line 10: hook cannot be called directly, use hook operator (myhook) -error in ./invalid.bro, line 11: hook cannot be called directly, use hook operator (myhook) -error in ./invalid.bro, line 12: not a valid hook call expression (2 + 2) -warning in ./invalid.bro, line 12: expression value ignored (2 + 2) -error in ./invalid.bro, line 13: not a valid hook call expression (2 + 2) -error in ./invalid.bro, line 15: hook cannot be called directly, use hook operator (h) -warning in ./invalid.bro, line 15: expression value ignored (h(3)) -error in ./invalid.bro, line 16: hook cannot be called directly, use hook operator (h) +error in ./invalid.zeek, line 9: hook cannot be called directly, use hook operator (myhook) +warning in ./invalid.zeek, line 9: expression value ignored (myhook(3)) +error in ./invalid.zeek, line 10: hook cannot be called directly, use hook operator (myhook) +error in ./invalid.zeek, line 11: hook cannot be called directly, use hook operator (myhook) +error in ./invalid.zeek, line 12: not a valid hook call expression (2 + 2) +warning in ./invalid.zeek, line 12: expression value ignored (2 + 2) +error in ./invalid.zeek, line 13: not a valid hook call expression (2 + 2) +error in ./invalid.zeek, line 15: hook cannot be called directly, use hook operator (h) +warning in ./invalid.zeek, line 15: expression value ignored (h(3)) +error in ./invalid.zeek, line 16: hook cannot be called directly, use hook operator (h) diff --git a/testing/btest/Baseline/language.index-assignment-invalid/out b/testing/btest/Baseline/language.index-assignment-invalid/out index 44e82d16f6..02dd4100ce 100644 --- a/testing/btest/Baseline/language.index-assignment-invalid/out +++ b/testing/btest/Baseline/language.index-assignment-invalid/out @@ -1,5 +1,5 @@ runtime error in /home/jon/pro/zeek/zeek/scripts/base/utils/queue.zeek, line 152: vector index assignment failed for invalid type 'myrec', value: [a=T, b=hi, c=], expression: Queue::ret[Queue::j], call stack: - #0 Queue::get_vector([initialized=T, vals={[2] = test,[6] = jkl;,[4] = asdf,[1] = goodbye,[5] = 3,[0] = hello,[3] = [a=T, b=hi, c=]}, settings=[max_len=], top=7, bottom=0, size=0], [hello, goodbye, test]) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.bro:19 - #1 bar(55) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.bro:27 - #2 foo(hi, 13) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.bro:39 + #0 Queue::get_vector([initialized=T, vals={[2] = test,[6] = jkl;,[4] = asdf,[1] = goodbye,[5] = 3,[0] = hello,[3] = [a=T, b=hi, c=]}, settings=[max_len=], top=7, bottom=0, size=0], [hello, goodbye, test]) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.zeek:19 + #1 bar(55) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.zeek:27 + #2 foo(hi, 13) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.index-assignment-invalid/index-assignment-invalid.zeek:39 #3 bro_init() diff --git a/testing/btest/Baseline/language.invalid_index/out b/testing/btest/Baseline/language.invalid_index/out index 4ba0373e91..aa3784aa3e 100644 --- a/testing/btest/Baseline/language.invalid_index/out +++ b/testing/btest/Baseline/language.invalid_index/out @@ -1,5 +1,5 @@ -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.invalid_index/invalid_index.bro, line 10: no such index (foo[1]) -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.invalid_index/invalid_index.bro, line 16: no such index (foo2[1]) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.invalid_index/invalid_index.zeek, line 10: no such index (foo[1]) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.invalid_index/invalid_index.zeek, line 16: no such index (foo2[1]) foo[0], 42 foo2[0], 13 done diff --git a/testing/btest/Baseline/language.outer_param_binding/out b/testing/btest/Baseline/language.outer_param_binding/out index 28ad03c85a..afdc4191cd 100644 --- a/testing/btest/Baseline/language.outer_param_binding/out +++ b/testing/btest/Baseline/language.outer_param_binding/out @@ -1,3 +1,3 @@ -error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.bro, line 16: referencing outer function IDs not supported (c) -error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.bro, line 16: referencing outer function IDs not supported (d) -error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.bro, line 17: referencing outer function IDs not supported (b) +error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.zeek, line 16: referencing outer function IDs not supported (c) +error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.zeek, line 16: referencing outer function IDs not supported (d) +error in /home/robin/bro/master/testing/btest/.tmp/language.outer_param_binding/outer_param_binding.zeek, line 17: referencing outer function IDs not supported (b) diff --git a/testing/btest/Baseline/language.record-bad-ctor/out b/testing/btest/Baseline/language.record-bad-ctor/out index d30d0ab9d3..e6ff4a8fd5 100644 --- a/testing/btest/Baseline/language.record-bad-ctor/out +++ b/testing/btest/Baseline/language.record-bad-ctor/out @@ -1,2 +1,2 @@ -error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.record-bad-ctor/record-bad-ctor.bro, line 6: no type given (asdfasdf) -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.record-bad-ctor/record-bad-ctor.bro, line 7: uninitialized list value ($ports=asdfasdf) +error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.record-bad-ctor/record-bad-ctor.zeek, line 6: no type given (asdfasdf) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.record-bad-ctor/record-bad-ctor.zeek, line 7: uninitialized list value ($ports=asdfasdf) diff --git a/testing/btest/Baseline/language.record-bad-ctor2/out b/testing/btest/Baseline/language.record-bad-ctor2/out index d5ce540dd8..12b0fe3959 100644 --- a/testing/btest/Baseline/language.record-bad-ctor2/out +++ b/testing/btest/Baseline/language.record-bad-ctor2/out @@ -1 +1 @@ -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-bad-ctor2/record-bad-ctor2.bro, line 14: bad type in record constructor ([[$cmd=echo hi]] and [$cmd=echo hi]) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-bad-ctor2/record-bad-ctor2.zeek, line 14: bad type in record constructor ([[$cmd=echo hi]] and [$cmd=echo hi]) diff --git a/testing/btest/Baseline/language.record-ceorce-orphan/out b/testing/btest/Baseline/language.record-ceorce-orphan/out index 59df204af2..f848945979 100644 --- a/testing/btest/Baseline/language.record-ceorce-orphan/out +++ b/testing/btest/Baseline/language.record-ceorce-orphan/out @@ -1,2 +1,2 @@ -error in /home/robin/bro/master/testing/btest/.tmp/language.record-ceorce-orphan/record-ceorce-orphan.bro, line 19: orphaned field "wtf" in record coercion ((coerce [$a=test, $b=42, $wtf=1.0 sec] to myrec)) -error in /home/robin/bro/master/testing/btest/.tmp/language.record-ceorce-orphan/record-ceorce-orphan.bro, line 21: orphaned field "wtf" in record coercion ((coerce [$a=test, $b=42, $wtf=1.0 sec] to myrec)) +error in /home/robin/bro/master/testing/btest/.tmp/language.record-ceorce-orphan/record-ceorce-orphan.zeek, line 19: orphaned field "wtf" in record coercion ((coerce [$a=test, $b=42, $wtf=1.0 sec] to myrec)) +error in /home/robin/bro/master/testing/btest/.tmp/language.record-ceorce-orphan/record-ceorce-orphan.zeek, line 21: orphaned field "wtf" in record coercion ((coerce [$a=test, $b=42, $wtf=1.0 sec] to myrec)) diff --git a/testing/btest/Baseline/language.record-coerce-clash/out b/testing/btest/Baseline/language.record-coerce-clash/out index 9ef4116c7e..cb45413c63 100644 --- a/testing/btest/Baseline/language.record-coerce-clash/out +++ b/testing/btest/Baseline/language.record-coerce-clash/out @@ -1 +1 @@ -error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/language.record-coerce-clash/record-coerce-clash.bro, line 13: type clash for field "cid" ((coerce [$cid=[$orig_h=1.2.3.4, $orig_p=0/tcp, $resp_h=0.0.0.0, $resp_p=wrong]] to myrec) and record { orig_h:addr; orig_p:port; resp_h:addr; resp_p:string; }) +error in /Users/jon/Projects/bro/bro/testing/btest/.tmp/language.record-coerce-clash/record-coerce-clash.zeek, line 13: type clash for field "cid" ((coerce [$cid=[$orig_h=1.2.3.4, $orig_p=0/tcp, $resp_h=0.0.0.0, $resp_p=wrong]] to myrec) and record { orig_h:addr; orig_p:port; resp_h:addr; resp_p:string; }) diff --git a/testing/btest/Baseline/language.record-default-set-mismatch/out b/testing/btest/Baseline/language.record-default-set-mismatch/out index c005138c0c..ba40f934f7 100644 --- a/testing/btest/Baseline/language.record-default-set-mismatch/out +++ b/testing/btest/Baseline/language.record-default-set-mismatch/out @@ -1 +1 @@ -error in /home/robin/bro/master/testing/btest/.tmp/language.record-default-set-mismatch/record-default-set-mismatch.bro, line 5: &default value has inconsistent type (&default=set(1, 2, 3)) +error in /home/robin/bro/master/testing/btest/.tmp/language.record-default-set-mismatch/record-default-set-mismatch.zeek, line 5: &default value has inconsistent type (&default=set(1, 2, 3)) diff --git a/testing/btest/Baseline/language.record-type-checking/out b/testing/btest/Baseline/language.record-type-checking/out index ecd5d7b8bb..50b0db5d8c 100644 --- a/testing/btest/Baseline/language.record-type-checking/out +++ b/testing/btest/Baseline/language.record-type-checking/out @@ -1,11 +1,11 @@ -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 9 and count: type clash for field "a" ((coerce [$a=0] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 9: bad record initializer ((coerce [$a=0] to error)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 12 and count: type clash for field "a" ((coerce [$a=1] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 12: bad record initializer ((coerce (coerce [$a=1] to error) to error)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 18 and count: type clash for field "a" ((coerce [$a=2] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 22 and count: type clash for field "a" ((coerce [$a=3] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 22: bad record initializer ((coerce [$a=3] to error)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 27 and count: type clash for field "a" ((coerce [$a=1000] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 33 and count: type clash for field "a" ((coerce [$a=1001] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 40 and count: type clash for field "a" ((coerce [$a=1002] to MyRec) and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.bro, line 46 and count: type clash for field "a" ((coerce [$a=1003] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 9 and count: type clash for field "a" ((coerce [$a=0] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 9: bad record initializer ((coerce [$a=0] to error)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 12 and count: type clash for field "a" ((coerce [$a=1] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 12: bad record initializer ((coerce (coerce [$a=1] to error) to error)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 18 and count: type clash for field "a" ((coerce [$a=2] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 22 and count: type clash for field "a" ((coerce [$a=3] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 22: bad record initializer ((coerce [$a=3] to error)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 27 and count: type clash for field "a" ((coerce [$a=1000] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 33 and count: type clash for field "a" ((coerce [$a=1001] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 40 and count: type clash for field "a" ((coerce [$a=1002] to MyRec) and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.record-type-checking/record-type-checking.zeek, line 46 and count: type clash for field "a" ((coerce [$a=1003] to MyRec) and count) diff --git a/testing/btest/Baseline/language.set-type-checking/out b/testing/btest/Baseline/language.set-type-checking/out index 0387146723..d27da6205a 100644 --- a/testing/btest/Baseline/language.set-type-checking/out +++ b/testing/btest/Baseline/language.set-type-checking/out @@ -1,24 +1,24 @@ -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 7: arithmetic mixed with non-arithmetic (port and 0) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 7 and port: type mismatch (0 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 7: inconsistent type in set constructor (set(0)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 10: arithmetic mixed with non-arithmetic (port and 1) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 10 and port: type mismatch (1 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 10: inconsistent type in set constructor (set(1)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 16: arithmetic mixed with non-arithmetic (port and 2) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 16 and port: type mismatch (2 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 16: inconsistent type in set constructor (set(2)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 7: arithmetic mixed with non-arithmetic (port and 0) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 7 and port: type mismatch (0 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 7: inconsistent type in set constructor (set(0)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 10: arithmetic mixed with non-arithmetic (port and 1) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 10 and port: type mismatch (1 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 10: inconsistent type in set constructor (set(1)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 16: arithmetic mixed with non-arithmetic (port and 2) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 16 and port: type mismatch (2 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 16: inconsistent type in set constructor (set(2)) error in port: arithmetic mixed with non-arithmetic (port and 3) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 20: initialization type mismatch in set (set(3) and 3) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 25: arithmetic mixed with non-arithmetic (port and 1000) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 25 and port: type mismatch (1000 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 25: inconsistent type in set constructor (set(1000)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 31: arithmetic mixed with non-arithmetic (port and 1001) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 31 and port: type mismatch (1001 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 31: inconsistent type in set constructor (set(1001)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 38: arithmetic mixed with non-arithmetic (port and 1002) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 38 and port: type mismatch (1002 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 38: inconsistent type in set constructor (set(1002)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 44: arithmetic mixed with non-arithmetic (port and 1003) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 44 and port: type mismatch (1003 and port) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 44: inconsistent type in set constructor (set(1003)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.bro, line 44: type clash in assignment (lea = set(1003)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 20: initialization type mismatch in set (set(3) and 3) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 25: arithmetic mixed with non-arithmetic (port and 1000) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 25 and port: type mismatch (1000 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 25: inconsistent type in set constructor (set(1000)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 31: arithmetic mixed with non-arithmetic (port and 1001) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 31 and port: type mismatch (1001 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 31: inconsistent type in set constructor (set(1001)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 38: arithmetic mixed with non-arithmetic (port and 1002) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 38 and port: type mismatch (1002 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 38: inconsistent type in set constructor (set(1002)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 44: arithmetic mixed with non-arithmetic (port and 1003) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 44 and port: type mismatch (1003 and port) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 44: inconsistent type in set constructor (set(1003)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.set-type-checking/set-type-checking.zeek, line 44: type clash in assignment (lea = set(1003)) diff --git a/testing/btest/Baseline/language.subnet-errors/out b/testing/btest/Baseline/language.subnet-errors/out index 5d8e3d76da..97e999ef9b 100644 --- a/testing/btest/Baseline/language.subnet-errors/out +++ b/testing/btest/Baseline/language.subnet-errors/out @@ -1,5 +1,5 @@ -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.subnet-errors/subnet-errors.bro, line 9: bad IPv4 subnet prefix length: 33 (1.2.3.4 / i) -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.subnet-errors/subnet-errors.bro, line 18: bad IPv6 subnet prefix length: 129 (:: / i) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.subnet-errors/subnet-errors.zeek, line 9: bad IPv4 subnet prefix length: 33 (1.2.3.4 / i) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.subnet-errors/subnet-errors.zeek, line 18: bad IPv6 subnet prefix length: 129 (:: / i) 1.2.3.4/32 ::/128 init last diff --git a/testing/btest/Baseline/language.switch-error-mixed/out b/testing/btest/Baseline/language.switch-error-mixed/out index 75fa1d84c2..679b34f6ef 100644 --- a/testing/btest/Baseline/language.switch-error-mixed/out +++ b/testing/btest/Baseline/language.switch-error-mixed/out @@ -1 +1 @@ -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-error-mixed/switch-error-mixed.bro, line 6: cannot mix cases with expressions and types (switch (v) {case 42:{ return (42!)}case type count:{ return (Count!)}}) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-error-mixed/switch-error-mixed.zeek, line 6: cannot mix cases with expressions and types (switch (v) {case 42:{ return (42!)}case type count:{ return (Count!)}}) diff --git a/testing/btest/Baseline/language.switch-incomplete/out b/testing/btest/Baseline/language.switch-incomplete/out index bfe4429956..4ce7d39a08 100644 --- a/testing/btest/Baseline/language.switch-incomplete/out +++ b/testing/btest/Baseline/language.switch-incomplete/out @@ -1 +1 @@ -error in /home/robin/bro/master/testing/btest/.tmp/language.switch-incomplete/switch-incomplete.bro, lines 7-8: case block must end in break/fallthrough/return statement (case 1:{ print 1}) +error in /home/robin/bro/master/testing/btest/.tmp/language.switch-incomplete/switch-incomplete.zeek, lines 7-8: case block must end in break/fallthrough/return statement (case 1:{ print 1}) diff --git a/testing/btest/Baseline/language.switch-types-error-duplicate/out b/testing/btest/Baseline/language.switch-types-error-duplicate/out index e523b14550..0ab618bc16 100644 --- a/testing/btest/Baseline/language.switch-types-error-duplicate/out +++ b/testing/btest/Baseline/language.switch-types-error-duplicate/out @@ -1 +1 @@ -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-duplicate/switch-types-error-duplicate.bro, lines 11-12: duplicate case label (case type bool, type count:{ return (Bool or address!)}) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-duplicate/switch-types-error-duplicate.zeek, lines 11-12: duplicate case label (case type bool, type count:{ return (Bool or address!)}) diff --git a/testing/btest/Baseline/language.switch-types-error-unsupported/out b/testing/btest/Baseline/language.switch-types-error-unsupported/out index 133c8653f2..7932073710 100644 --- a/testing/btest/Baseline/language.switch-types-error-unsupported/out +++ b/testing/btest/Baseline/language.switch-types-error-unsupported/out @@ -1,3 +1,3 @@ -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.bro, lines 9-10: cannot cast switch expression to case type (case type count:{ return (Count!)}) -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.bro, lines 11-12: cannot cast switch expression to case type (case type bool, type addr:{ return (Bool or address!)}) -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.bro, lines 11-12: cannot cast switch expression to case type (case type bool, type addr:{ return (Bool or address!)}) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.zeek, lines 9-10: cannot cast switch expression to case type (case type count:{ return (Count!)}) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.zeek, lines 11-12: cannot cast switch expression to case type (case type bool, type addr:{ return (Bool or address!)}) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.switch-types-error-unsupported/switch-types-error-unsupported.zeek, lines 11-12: cannot cast switch expression to case type (case type bool, type addr:{ return (Bool or address!)}) diff --git a/testing/btest/Baseline/language.table-type-checking/out b/testing/btest/Baseline/language.table-type-checking/out index 488cb83ab2..a6307a6155 100644 --- a/testing/btest/Baseline/language.table-type-checking/out +++ b/testing/btest/Baseline/language.table-type-checking/out @@ -1,14 +1,14 @@ -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 7: type clash (port and zero) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 7: inconsistent types in table constructor (table(zero = 0)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 10: type clash (port and one) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 10: inconsistent types in table constructor (table(one = 1)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 17: type clash in assignment (gda = gda2) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 21 and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 4: index type doesn't match table (three and list of port) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 21: type clash in table assignment (three = 3) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 26: type clash (port and thousand) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 26: inconsistent types in table constructor (table(thousand = 1000)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 32: type clash (port and thousand-one) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 32: inconsistent types in table constructor (table(thousand-one = 1001)) -error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 39: type clash (port and thousand-two) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 39: inconsistent types in table constructor (table(thousand-two = 1002)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.bro, line 45: type clash in assignment (lea = table(thousand-three = 1003)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 7: type clash (port and zero) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 7: inconsistent types in table constructor (table(zero = 0)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 10: type clash (port and one) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 10: inconsistent types in table constructor (table(one = 1)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 17: type clash in assignment (gda = gda2) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 21 and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 4: index type doesn't match table (three and list of port) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 21: type clash in table assignment (three = 3) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 26: type clash (port and thousand) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 26: inconsistent types in table constructor (table(thousand = 1000)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 32: type clash (port and thousand-one) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 32: inconsistent types in table constructor (table(thousand-one = 1001)) +error in port and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 39: type clash (port and thousand-two) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 39: inconsistent types in table constructor (table(thousand-two = 1002)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.table-type-checking/table-type-checking.zeek, line 45: type clash in assignment (lea = table(thousand-three = 1003)) diff --git a/testing/btest/Baseline/language.ternary-record-mismatch/out b/testing/btest/Baseline/language.ternary-record-mismatch/out index 0c1cefce0d..91a3aa2e02 100644 --- a/testing/btest/Baseline/language.ternary-record-mismatch/out +++ b/testing/btest/Baseline/language.ternary-record-mismatch/out @@ -1 +1 @@ -error in /Users/jon/pro/zeek/zeek/testing/btest/.tmp/language.ternary-record-mismatch/ternary-record-mismatch.bro, lines 13-14: operands must be of the same type ((F) ? (coerce [$a=a string, $b=6] to MyRecord) : [$a=a different string, $b=7]) +error in /Users/jon/pro/zeek/zeek/testing/btest/.tmp/language.ternary-record-mismatch/ternary-record-mismatch.zeek, lines 13-14: operands must be of the same type ((F) ? (coerce [$a=a string, $b=6] to MyRecord) : [$a=a different string, $b=7]) diff --git a/testing/btest/Baseline/language.type-cast-error-dynamic/output b/testing/btest/Baseline/language.type-cast-error-dynamic/output index 7c4ec0332f..dfac361f11 100644 --- a/testing/btest/Baseline/language.type-cast-error-dynamic/output +++ b/testing/btest/Baseline/language.type-cast-error-dynamic/output @@ -1,4 +1,4 @@ -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.bro, line 11: invalid cast of value with type 'count' to type 'string' (a as string) -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.bro, line 11: invalid cast of value with type 'record { a:addr; b:port; }' to type 'string' (a as string) -expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.bro, line 11: invalid cast of value with type 'record { data:opaque of Broker::Data; }' to type 'string' (nil $data field) (a as string) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'count' to type 'string' (a as string) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'record { a:addr; b:port; }' to type 'string' (a as string) +expression error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.type-cast-error-dynamic/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'record { data:opaque of Broker::Data; }' to type 'string' (nil $data field) (a as string) data is string, F diff --git a/testing/btest/Baseline/language.type-cast-error-static/output b/testing/btest/Baseline/language.type-cast-error-static/output index a93e262f21..bd00361939 100644 --- a/testing/btest/Baseline/language.type-cast-error-static/output +++ b/testing/btest/Baseline/language.type-cast-error-static/output @@ -1,2 +1,2 @@ -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.type-cast-error-static/type-cast-error-static.bro, line 14: cast not supported (string as count) -error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.type-cast-error-static/type-cast-error-static.bro, line 15: cast not supported (string as X) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.type-cast-error-static/type-cast-error-static.zeek, line 14: cast not supported (string as count) +error in /home/robin/bro/lang-ext/testing/btest/.tmp/language.type-cast-error-static/type-cast-error-static.zeek, line 15: cast not supported (string as X) diff --git a/testing/btest/Baseline/language.type-type-error/.stderr b/testing/btest/Baseline/language.type-type-error/.stderr index 95cb065ece..b0e0800c72 100644 --- a/testing/btest/Baseline/language.type-type-error/.stderr +++ b/testing/btest/Baseline/language.type-type-error/.stderr @@ -1 +1 @@ -error in /home/jsiwek/bro/testing/btest/.tmp/language.type-type-error/type-type-error.bro, line 13: not a record (r$a) +error in /home/jsiwek/bro/testing/btest/.tmp/language.type-type-error/type-type-error.zeek, line 13: not a record (r$a) diff --git a/testing/btest/Baseline/language.undefined-delete-field/output b/testing/btest/Baseline/language.undefined-delete-field/output index bd0fb99289..99a71b1087 100644 --- a/testing/btest/Baseline/language.undefined-delete-field/output +++ b/testing/btest/Baseline/language.undefined-delete-field/output @@ -1,2 +1,2 @@ -error in /Users/johanna/bro/master/testing/btest/.tmp/language.undefined-delete-field/undefined-delete-field.bro, line 14: no such field in record (x$c) +error in /Users/johanna/bro/master/testing/btest/.tmp/language.undefined-delete-field/undefined-delete-field.zeek, line 14: no such field in record (x$c) 1 diff --git a/testing/btest/Baseline/language.uninitialized-local/out b/testing/btest/Baseline/language.uninitialized-local/out index 24d45d3456..dd6867f524 100644 --- a/testing/btest/Baseline/language.uninitialized-local/out +++ b/testing/btest/Baseline/language.uninitialized-local/out @@ -1 +1 @@ -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.uninitialized-local/uninitialized-local.bro, line 16: value used but not set (my_string) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.uninitialized-local/uninitialized-local.zeek, line 16: value used but not set (my_string) diff --git a/testing/btest/Baseline/language.uninitialized-local2/out b/testing/btest/Baseline/language.uninitialized-local2/out index bba567878e..ba668f08ff 100644 --- a/testing/btest/Baseline/language.uninitialized-local2/out +++ b/testing/btest/Baseline/language.uninitialized-local2/out @@ -1,2 +1,2 @@ -expression error in /home/jon/projects/bro/bro/testing/btest/.tmp/language.uninitialized-local2/uninitialized-local2.bro, line 19: value used but not set (var_b) +expression error in /home/jon/projects/bro/bro/testing/btest/.tmp/language.uninitialized-local2/uninitialized-local2.zeek, line 19: value used but not set (var_b) var_a is, baz diff --git a/testing/btest/Baseline/language.vector-type-checking/out b/testing/btest/Baseline/language.vector-type-checking/out index e96017082a..33be41836f 100644 --- a/testing/btest/Baseline/language.vector-type-checking/out +++ b/testing/btest/Baseline/language.vector-type-checking/out @@ -1,19 +1,19 @@ -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 7: arithmetic mixed with non-arithmetic (count and zero) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 7 and count: type mismatch (zero and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 7: inconsistent types in vector constructor (vector(zero)) -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 10: arithmetic mixed with non-arithmetic (count and one) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 10 and count: type mismatch (one and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 10: inconsistent types in vector constructor (vector(one)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 17: type clash in assignment (gda = gda2) -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 21: arithmetic mixed with non-arithmetic (count and three) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 21: initialization type mismatch at index 0 (vector(three) and three) -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 26: arithmetic mixed with non-arithmetic (count and thousand) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 26 and count: type mismatch (thousand and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 26: inconsistent types in vector constructor (vector(thousand)) -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 32: arithmetic mixed with non-arithmetic (count and thousand-one) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 32 and count: type mismatch (thousand-one and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 32: inconsistent types in vector constructor (vector(thousand-one)) -error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 39: arithmetic mixed with non-arithmetic (count and thousand-two) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 39 and count: type mismatch (thousand-two and count) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 39: inconsistent types in vector constructor (vector(thousand-two)) -error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.bro, line 45: type clash in assignment (lea = vector(thousand-three)) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 7: arithmetic mixed with non-arithmetic (count and zero) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 7 and count: type mismatch (zero and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 7: inconsistent types in vector constructor (vector(zero)) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 10: arithmetic mixed with non-arithmetic (count and one) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 10 and count: type mismatch (one and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 10: inconsistent types in vector constructor (vector(one)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 17: type clash in assignment (gda = gda2) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 21: arithmetic mixed with non-arithmetic (count and three) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 21: initialization type mismatch at index 0 (vector(three) and three) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 26: arithmetic mixed with non-arithmetic (count and thousand) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 26 and count: type mismatch (thousand and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 26: inconsistent types in vector constructor (vector(thousand)) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 32: arithmetic mixed with non-arithmetic (count and thousand-one) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 32 and count: type mismatch (thousand-one and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 32: inconsistent types in vector constructor (vector(thousand-one)) +error in count and /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 39: arithmetic mixed with non-arithmetic (count and thousand-two) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 39 and count: type mismatch (thousand-two and count) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 39: inconsistent types in vector constructor (vector(thousand-two)) +error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.vector-type-checking/vector-type-checking.zeek, line 45: type clash in assignment (lea = vector(thousand-three)) diff --git a/testing/btest/Baseline/language.when-unitialized-rhs/out b/testing/btest/Baseline/language.when-unitialized-rhs/out index 6698887be0..bad1bdbb78 100644 --- a/testing/btest/Baseline/language.when-unitialized-rhs/out +++ b/testing/btest/Baseline/language.when-unitialized-rhs/out @@ -1,5 +1,5 @@ -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.when-unitialized-rhs/when-unitialized-rhs.bro, line 9: value used but not set (crashMe) -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.when-unitialized-rhs/when-unitialized-rhs.bro, line 14: value used but not set (x) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.when-unitialized-rhs/when-unitialized-rhs.zeek, line 9: value used but not set (crashMe) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.when-unitialized-rhs/when-unitialized-rhs.zeek, line 14: value used but not set (x) 1 2 3 diff --git a/testing/btest/Baseline/language.wrong-delete-field/output b/testing/btest/Baseline/language.wrong-delete-field/output index 1eefa1d2fe..1250f03c3d 100644 --- a/testing/btest/Baseline/language.wrong-delete-field/output +++ b/testing/btest/Baseline/language.wrong-delete-field/output @@ -1 +1 @@ -error in /da/home/robin/bro/master/testing/btest/.tmp/language.wrong-delete-field/wrong-delete-field.bro, line 10: illegal delete statement (delete x$a) +error in /da/home/robin/bro/master/testing/btest/.tmp/language.wrong-delete-field/wrong-delete-field.zeek, line 10: illegal delete statement (delete x$a) diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output index 0d383879f7..cd3ac7337f 100644 --- a/testing/btest/Baseline/plugins.hooks/output +++ b/testing/btest/Baseline/plugins.hooks/output @@ -788,7 +788,7 @@ 0.000000 MetaHookPost LoadFile(0, .<...>/weird.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, <...>/__load__.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, <...>/__preload__.zeek) -> -1 -0.000000 MetaHookPost LoadFile(0, <...>/hooks.bro) -> -1 +0.000000 MetaHookPost LoadFile(0, <...>/hooks.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/Bro_KRB.types.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/Bro_SNMP.types.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/active-http.zeek) -> -1 @@ -1691,7 +1691,7 @@ 0.000000 MetaHookPre LoadFile(0, .<...>/weird.zeek) 0.000000 MetaHookPre LoadFile(0, <...>/__load__.zeek) 0.000000 MetaHookPre LoadFile(0, <...>/__preload__.zeek) -0.000000 MetaHookPre LoadFile(0, <...>/hooks.bro) +0.000000 MetaHookPre LoadFile(0, <...>/hooks.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/Bro_KRB.types.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/Bro_SNMP.types.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/active-http.zeek) @@ -2602,7 +2602,7 @@ 0.000000 | HookLoadFile .<...>/weird.zeek 0.000000 | HookLoadFile <...>/__load__.zeek 0.000000 | HookLoadFile <...>/__preload__.zeek -0.000000 | HookLoadFile <...>/hooks.bro +0.000000 | HookLoadFile <...>/hooks.zeek 0.000000 | HookLoadFile base<...>/Bro_KRB.types.bif.zeek 0.000000 | HookLoadFile base<...>/Bro_SNMP.types.bif.zeek 0.000000 | HookLoadFile base<...>/active-http.zeek diff --git a/testing/btest/Baseline/plugins.reporter-hook/output b/testing/btest/Baseline/plugins.reporter-hook/output index 8f706ec644..36418d2405 100644 --- a/testing/btest/Baseline/plugins.reporter-hook/output +++ b/testing/btest/Baseline/plugins.reporter-hook/output @@ -1,10 +1,10 @@ - | Hook Some Info <...>/reporter-hook.bro, line 16 - | Hook error An Error <...>/reporter-hook.bro, line 18 - | Hook error An Error that does not show up in the log <...>/reporter-hook.bro, line 19 - | Hook expression error field value missing (b$a) <...>/reporter-hook.bro, line 23 - | Hook warning A warning <...>/reporter-hook.bro, line 17 -<...>/reporter-hook.bro, line 16: Some Info -error in <...>/reporter-hook.bro, line 18: An Error -error in <...>/reporter-hook.bro, line 19: An Error that does not show up in the log -expression error in <...>/reporter-hook.bro, line 23: field value missing (b$a) -warning in <...>/reporter-hook.bro, line 17: A warning + | Hook Some Info <...>/reporter-hook.zeek, line 16 + | Hook error An Error <...>/reporter-hook.zeek, line 18 + | Hook error An Error that does not show up in the log <...>/reporter-hook.zeek, line 19 + | Hook expression error field value missing (b$a) <...>/reporter-hook.zeek, line 23 + | Hook warning A warning <...>/reporter-hook.zeek, line 17 +<...>/reporter-hook.zeek, line 16: Some Info +error in <...>/reporter-hook.zeek, line 18: An Error +error in <...>/reporter-hook.zeek, line 19: An Error that does not show up in the log +expression error in <...>/reporter-hook.zeek, line 23: field value missing (b$a) +warning in <...>/reporter-hook.zeek, line 17: A warning diff --git a/testing/btest/Baseline/plugins.reporter-hook/reporter.log b/testing/btest/Baseline/plugins.reporter-hook/reporter.log index bce2fb909f..fc5a79bc86 100644 --- a/testing/btest/Baseline/plugins.reporter-hook/reporter.log +++ b/testing/btest/Baseline/plugins.reporter-hook/reporter.log @@ -6,8 +6,8 @@ #open 2017-07-26-17-58-52 #fields ts level message location #types time enum string string -0.000000 Reporter::INFO Some Info /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.bro, line 16 -0.000000 Reporter::WARNING A warning /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.bro, line 17 -0.000000 Reporter::ERROR An Error /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.bro, line 18 -0.000000 Reporter::ERROR field value missing (b$a) /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.bro, line 23 +0.000000 Reporter::INFO Some Info /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.zeek, line 16 +0.000000 Reporter::WARNING A warning /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.zeek, line 17 +0.000000 Reporter::ERROR An Error /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.zeek, line 18 +0.000000 Reporter::ERROR field value missing (b$a) /Users/johanna/corelight/bro/testing/btest/.tmp/plugins.reporter-hook/reporter-hook.zeek, line 23 #close 2017-07-26-17-58-52 diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log index f4b240d619..a58380f26c 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log +++ b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log @@ -1,2 +1,2 @@ -1535139819.649067 Reporter::INFO qux /home/jon/projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-cluster-error/field-extension-cluster-error.bro, line XX -1535139821.906059 bah manager-1 0.000000 Reporter::INFO qux /home/jon/projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-cluster-error/field-extension-cluster-error.bro, line XX +1535139819.649067 Reporter::INFO qux /home/jon/projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-cluster-error/field-extension-cluster-error.zeek, line XX +1535139821.906059 bah manager-1 0.000000 Reporter::INFO qux /home/jon/projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-cluster-error/field-extension-cluster-error.zeek, line XX diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-table/.stderr b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-table/.stderr index ff76d4ea54..5efd4bac43 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-table/.stderr +++ b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-table/.stderr @@ -1,2 +1,2 @@ -error in /testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-table/field-extension-table.bro, line 9: &log applied to a type that cannot be logged (&log) -error in /testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-table/field-extension-table.bro, line 18: syntax error, at or near "{" +error in /testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-table/field-extension-table.zeek, line 9: &log applied to a type that cannot be logged (&log) +error in /testing/btest/.tmp/scripts.base.frameworks.logging.field-extension-table/field-extension-table.zeek, line 18: syntax error, at or near "{" diff --git a/testing/btest/Baseline/scripts.base.frameworks.reporter.disable-stderr/reporter.log b/testing/btest/Baseline/scripts.base.frameworks.reporter.disable-stderr/reporter.log index 144c094b2f..744f050046 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.reporter.disable-stderr/reporter.log +++ b/testing/btest/Baseline/scripts.base.frameworks.reporter.disable-stderr/reporter.log @@ -6,5 +6,5 @@ #open 2012-08-10-20-09-16 #fields ts level message location #types time enum string string -0.000000 Reporter::ERROR no such index (test[3]) /da/home/robin/bro/master/testing/btest/.tmp/scripts.base.frameworks.reporter.disable-stderr/disable-stderr.bro, line 12 +0.000000 Reporter::ERROR no such index (test[3]) /da/home/robin/bro/master/testing/btest/.tmp/scripts.base.frameworks.reporter.disable-stderr/disable-stderr.zeek, line 12 #close 2012-08-10-20-09-16 diff --git a/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/.stderr b/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/.stderr index ed161b2409..b01cfa1e84 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/.stderr +++ b/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/.stderr @@ -1 +1 @@ -expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.reporter.stderr/stderr.bro, line 9: no such index (test[3]) +expression error in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.reporter.stderr/stderr.zeek, line 9: no such index (test[3]) diff --git a/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/reporter.log b/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/reporter.log index 391cf77a00..705bb357fa 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/reporter.log +++ b/testing/btest/Baseline/scripts.base.frameworks.reporter.stderr/reporter.log @@ -6,5 +6,5 @@ #open 2013-01-18-18-29-30 #fields ts level message location #types time enum string string -0.000000 Reporter::ERROR no such index (test[3]) /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.reporter.stderr/stderr.bro, line 9 +0.000000 Reporter::ERROR no such index (test[3]) /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/scripts.base.frameworks.reporter.stderr/stderr.zeek, line 9 #close 2013-01-18-18-29-30 diff --git a/testing/btest/bifs/addr_count_conversion.bro b/testing/btest/bifs/addr_count_conversion.zeek similarity index 100% rename from testing/btest/bifs/addr_count_conversion.bro rename to testing/btest/bifs/addr_count_conversion.zeek diff --git a/testing/btest/bifs/addr_to_ptr_name.bro b/testing/btest/bifs/addr_to_ptr_name.zeek similarity index 100% rename from testing/btest/bifs/addr_to_ptr_name.bro rename to testing/btest/bifs/addr_to_ptr_name.zeek diff --git a/testing/btest/bifs/addr_version.bro b/testing/btest/bifs/addr_version.zeek similarity index 100% rename from testing/btest/bifs/addr_version.bro rename to testing/btest/bifs/addr_version.zeek diff --git a/testing/btest/bifs/all_set.bro b/testing/btest/bifs/all_set.zeek similarity index 100% rename from testing/btest/bifs/all_set.bro rename to testing/btest/bifs/all_set.zeek diff --git a/testing/btest/bifs/analyzer_name.bro b/testing/btest/bifs/analyzer_name.zeek similarity index 100% rename from testing/btest/bifs/analyzer_name.bro rename to testing/btest/bifs/analyzer_name.zeek diff --git a/testing/btest/bifs/any_set.bro b/testing/btest/bifs/any_set.zeek similarity index 100% rename from testing/btest/bifs/any_set.bro rename to testing/btest/bifs/any_set.zeek diff --git a/testing/btest/bifs/bloomfilter-seed.bro b/testing/btest/bifs/bloomfilter-seed.zeek similarity index 100% rename from testing/btest/bifs/bloomfilter-seed.bro rename to testing/btest/bifs/bloomfilter-seed.zeek diff --git a/testing/btest/bifs/bloomfilter.bro b/testing/btest/bifs/bloomfilter.zeek similarity index 100% rename from testing/btest/bifs/bloomfilter.bro rename to testing/btest/bifs/bloomfilter.zeek diff --git a/testing/btest/bifs/bro_version.bro b/testing/btest/bifs/bro_version.zeek similarity index 100% rename from testing/btest/bifs/bro_version.bro rename to testing/btest/bifs/bro_version.zeek diff --git a/testing/btest/bifs/bytestring_to_count.bro b/testing/btest/bifs/bytestring_to_count.zeek similarity index 100% rename from testing/btest/bifs/bytestring_to_count.bro rename to testing/btest/bifs/bytestring_to_count.zeek diff --git a/testing/btest/bifs/bytestring_to_double.bro b/testing/btest/bifs/bytestring_to_double.zeek similarity index 100% rename from testing/btest/bifs/bytestring_to_double.bro rename to testing/btest/bifs/bytestring_to_double.zeek diff --git a/testing/btest/bifs/bytestring_to_hexstr.bro b/testing/btest/bifs/bytestring_to_hexstr.zeek similarity index 100% rename from testing/btest/bifs/bytestring_to_hexstr.bro rename to testing/btest/bifs/bytestring_to_hexstr.zeek diff --git a/testing/btest/bifs/capture_state_updates.bro b/testing/btest/bifs/capture_state_updates.zeek similarity index 100% rename from testing/btest/bifs/capture_state_updates.bro rename to testing/btest/bifs/capture_state_updates.zeek diff --git a/testing/btest/bifs/cat.bro b/testing/btest/bifs/cat.zeek similarity index 100% rename from testing/btest/bifs/cat.bro rename to testing/btest/bifs/cat.zeek diff --git a/testing/btest/bifs/cat_string_array.bro b/testing/btest/bifs/cat_string_array.zeek similarity index 100% rename from testing/btest/bifs/cat_string_array.bro rename to testing/btest/bifs/cat_string_array.zeek diff --git a/testing/btest/bifs/check_subnet.bro b/testing/btest/bifs/check_subnet.zeek similarity index 100% rename from testing/btest/bifs/check_subnet.bro rename to testing/btest/bifs/check_subnet.zeek diff --git a/testing/btest/bifs/checkpoint_state.bro b/testing/btest/bifs/checkpoint_state.zeek similarity index 100% rename from testing/btest/bifs/checkpoint_state.bro rename to testing/btest/bifs/checkpoint_state.zeek diff --git a/testing/btest/bifs/clear_table.bro b/testing/btest/bifs/clear_table.zeek similarity index 100% rename from testing/btest/bifs/clear_table.bro rename to testing/btest/bifs/clear_table.zeek diff --git a/testing/btest/bifs/convert_for_pattern.bro b/testing/btest/bifs/convert_for_pattern.zeek similarity index 100% rename from testing/btest/bifs/convert_for_pattern.bro rename to testing/btest/bifs/convert_for_pattern.zeek diff --git a/testing/btest/bifs/count_to_addr.bro b/testing/btest/bifs/count_to_addr.zeek similarity index 100% rename from testing/btest/bifs/count_to_addr.bro rename to testing/btest/bifs/count_to_addr.zeek diff --git a/testing/btest/bifs/create_file.bro b/testing/btest/bifs/create_file.zeek similarity index 100% rename from testing/btest/bifs/create_file.bro rename to testing/btest/bifs/create_file.zeek diff --git a/testing/btest/bifs/current_analyzer.bro b/testing/btest/bifs/current_analyzer.zeek similarity index 100% rename from testing/btest/bifs/current_analyzer.bro rename to testing/btest/bifs/current_analyzer.zeek diff --git a/testing/btest/bifs/current_time.bro b/testing/btest/bifs/current_time.zeek similarity index 100% rename from testing/btest/bifs/current_time.bro rename to testing/btest/bifs/current_time.zeek diff --git a/testing/btest/bifs/decode_base64.bro b/testing/btest/bifs/decode_base64.zeek similarity index 100% rename from testing/btest/bifs/decode_base64.bro rename to testing/btest/bifs/decode_base64.zeek diff --git a/testing/btest/bifs/decode_base64_conn.bro b/testing/btest/bifs/decode_base64_conn.zeek similarity index 100% rename from testing/btest/bifs/decode_base64_conn.bro rename to testing/btest/bifs/decode_base64_conn.zeek diff --git a/testing/btest/bifs/directory_operations.bro b/testing/btest/bifs/directory_operations.zeek similarity index 100% rename from testing/btest/bifs/directory_operations.bro rename to testing/btest/bifs/directory_operations.zeek diff --git a/testing/btest/bifs/dump_current_packet.bro b/testing/btest/bifs/dump_current_packet.zeek similarity index 100% rename from testing/btest/bifs/dump_current_packet.bro rename to testing/btest/bifs/dump_current_packet.zeek diff --git a/testing/btest/bifs/edit.bro b/testing/btest/bifs/edit.zeek similarity index 100% rename from testing/btest/bifs/edit.bro rename to testing/btest/bifs/edit.zeek diff --git a/testing/btest/bifs/encode_base64.bro b/testing/btest/bifs/encode_base64.zeek similarity index 100% rename from testing/btest/bifs/encode_base64.bro rename to testing/btest/bifs/encode_base64.zeek diff --git a/testing/btest/bifs/entropy_test.bro b/testing/btest/bifs/entropy_test.zeek similarity index 100% rename from testing/btest/bifs/entropy_test.bro rename to testing/btest/bifs/entropy_test.zeek diff --git a/testing/btest/bifs/enum_to_int.bro b/testing/btest/bifs/enum_to_int.zeek similarity index 100% rename from testing/btest/bifs/enum_to_int.bro rename to testing/btest/bifs/enum_to_int.zeek diff --git a/testing/btest/bifs/escape_string.bro b/testing/btest/bifs/escape_string.zeek similarity index 100% rename from testing/btest/bifs/escape_string.bro rename to testing/btest/bifs/escape_string.zeek diff --git a/testing/btest/bifs/exit.bro b/testing/btest/bifs/exit.zeek similarity index 100% rename from testing/btest/bifs/exit.bro rename to testing/btest/bifs/exit.zeek diff --git a/testing/btest/bifs/file_mode.bro b/testing/btest/bifs/file_mode.zeek similarity index 100% rename from testing/btest/bifs/file_mode.bro rename to testing/btest/bifs/file_mode.zeek diff --git a/testing/btest/bifs/filter_subnet_table.bro b/testing/btest/bifs/filter_subnet_table.zeek similarity index 100% rename from testing/btest/bifs/filter_subnet_table.bro rename to testing/btest/bifs/filter_subnet_table.zeek diff --git a/testing/btest/bifs/find_all.bro b/testing/btest/bifs/find_all.zeek similarity index 100% rename from testing/btest/bifs/find_all.bro rename to testing/btest/bifs/find_all.zeek diff --git a/testing/btest/bifs/find_entropy.bro b/testing/btest/bifs/find_entropy.zeek similarity index 100% rename from testing/btest/bifs/find_entropy.bro rename to testing/btest/bifs/find_entropy.zeek diff --git a/testing/btest/bifs/find_last.bro b/testing/btest/bifs/find_last.zeek similarity index 100% rename from testing/btest/bifs/find_last.bro rename to testing/btest/bifs/find_last.zeek diff --git a/testing/btest/bifs/fmt.bro b/testing/btest/bifs/fmt.zeek similarity index 100% rename from testing/btest/bifs/fmt.bro rename to testing/btest/bifs/fmt.zeek diff --git a/testing/btest/bifs/fmt_ftp_port.bro b/testing/btest/bifs/fmt_ftp_port.zeek similarity index 100% rename from testing/btest/bifs/fmt_ftp_port.bro rename to testing/btest/bifs/fmt_ftp_port.zeek diff --git a/testing/btest/bifs/get_current_packet_header.bro b/testing/btest/bifs/get_current_packet_header.zeek similarity index 100% rename from testing/btest/bifs/get_current_packet_header.bro rename to testing/btest/bifs/get_current_packet_header.zeek diff --git a/testing/btest/bifs/get_matcher_stats.bro b/testing/btest/bifs/get_matcher_stats.zeek similarity index 100% rename from testing/btest/bifs/get_matcher_stats.bro rename to testing/btest/bifs/get_matcher_stats.zeek diff --git a/testing/btest/bifs/get_port_transport_proto.bro b/testing/btest/bifs/get_port_transport_proto.zeek similarity index 100% rename from testing/btest/bifs/get_port_transport_proto.bro rename to testing/btest/bifs/get_port_transport_proto.zeek diff --git a/testing/btest/bifs/gethostname.bro b/testing/btest/bifs/gethostname.zeek similarity index 100% rename from testing/btest/bifs/gethostname.bro rename to testing/btest/bifs/gethostname.zeek diff --git a/testing/btest/bifs/getpid.bro b/testing/btest/bifs/getpid.zeek similarity index 100% rename from testing/btest/bifs/getpid.bro rename to testing/btest/bifs/getpid.zeek diff --git a/testing/btest/bifs/getsetenv.bro b/testing/btest/bifs/getsetenv.zeek similarity index 100% rename from testing/btest/bifs/getsetenv.bro rename to testing/btest/bifs/getsetenv.zeek diff --git a/testing/btest/bifs/global_ids.bro b/testing/btest/bifs/global_ids.zeek similarity index 100% rename from testing/btest/bifs/global_ids.bro rename to testing/btest/bifs/global_ids.zeek diff --git a/testing/btest/bifs/global_sizes.bro b/testing/btest/bifs/global_sizes.zeek similarity index 100% rename from testing/btest/bifs/global_sizes.bro rename to testing/btest/bifs/global_sizes.zeek diff --git a/testing/btest/bifs/haversine_distance.bro b/testing/btest/bifs/haversine_distance.zeek similarity index 100% rename from testing/btest/bifs/haversine_distance.bro rename to testing/btest/bifs/haversine_distance.zeek diff --git a/testing/btest/bifs/hexdump.bro b/testing/btest/bifs/hexdump.zeek similarity index 100% rename from testing/btest/bifs/hexdump.bro rename to testing/btest/bifs/hexdump.zeek diff --git a/testing/btest/bifs/hexstr_to_bytestring.bro b/testing/btest/bifs/hexstr_to_bytestring.zeek similarity index 100% rename from testing/btest/bifs/hexstr_to_bytestring.bro rename to testing/btest/bifs/hexstr_to_bytestring.zeek diff --git a/testing/btest/bifs/hll_cardinality.bro b/testing/btest/bifs/hll_cardinality.zeek similarity index 100% rename from testing/btest/bifs/hll_cardinality.bro rename to testing/btest/bifs/hll_cardinality.zeek diff --git a/testing/btest/bifs/hll_large_estimate.bro b/testing/btest/bifs/hll_large_estimate.zeek similarity index 100% rename from testing/btest/bifs/hll_large_estimate.bro rename to testing/btest/bifs/hll_large_estimate.zeek diff --git a/testing/btest/bifs/identify_data.bro b/testing/btest/bifs/identify_data.zeek similarity index 100% rename from testing/btest/bifs/identify_data.bro rename to testing/btest/bifs/identify_data.zeek diff --git a/testing/btest/bifs/is_ascii.bro b/testing/btest/bifs/is_ascii.zeek similarity index 100% rename from testing/btest/bifs/is_ascii.bro rename to testing/btest/bifs/is_ascii.zeek diff --git a/testing/btest/bifs/is_local_interface.bro b/testing/btest/bifs/is_local_interface.zeek similarity index 100% rename from testing/btest/bifs/is_local_interface.bro rename to testing/btest/bifs/is_local_interface.zeek diff --git a/testing/btest/bifs/is_port.bro b/testing/btest/bifs/is_port.zeek similarity index 100% rename from testing/btest/bifs/is_port.bro rename to testing/btest/bifs/is_port.zeek diff --git a/testing/btest/bifs/join_string.bro b/testing/btest/bifs/join_string.zeek similarity index 100% rename from testing/btest/bifs/join_string.bro rename to testing/btest/bifs/join_string.zeek diff --git a/testing/btest/bifs/levenshtein_distance.bro b/testing/btest/bifs/levenshtein_distance.zeek similarity index 100% rename from testing/btest/bifs/levenshtein_distance.bro rename to testing/btest/bifs/levenshtein_distance.zeek diff --git a/testing/btest/bifs/lookup_ID.bro b/testing/btest/bifs/lookup_ID.zeek similarity index 100% rename from testing/btest/bifs/lookup_ID.bro rename to testing/btest/bifs/lookup_ID.zeek diff --git a/testing/btest/bifs/lowerupper.bro b/testing/btest/bifs/lowerupper.zeek similarity index 100% rename from testing/btest/bifs/lowerupper.bro rename to testing/btest/bifs/lowerupper.zeek diff --git a/testing/btest/bifs/lstrip.bro b/testing/btest/bifs/lstrip.zeek similarity index 100% rename from testing/btest/bifs/lstrip.bro rename to testing/btest/bifs/lstrip.zeek diff --git a/testing/btest/bifs/mask_addr.bro b/testing/btest/bifs/mask_addr.zeek similarity index 100% rename from testing/btest/bifs/mask_addr.bro rename to testing/btest/bifs/mask_addr.zeek diff --git a/testing/btest/bifs/matching_subnets.bro b/testing/btest/bifs/matching_subnets.zeek similarity index 100% rename from testing/btest/bifs/matching_subnets.bro rename to testing/btest/bifs/matching_subnets.zeek diff --git a/testing/btest/bifs/math.bro b/testing/btest/bifs/math.zeek similarity index 100% rename from testing/btest/bifs/math.bro rename to testing/btest/bifs/math.zeek diff --git a/testing/btest/bifs/merge_pattern.bro b/testing/btest/bifs/merge_pattern.zeek similarity index 100% rename from testing/btest/bifs/merge_pattern.bro rename to testing/btest/bifs/merge_pattern.zeek diff --git a/testing/btest/bifs/netbios-functions.bro b/testing/btest/bifs/netbios-functions.zeek similarity index 100% rename from testing/btest/bifs/netbios-functions.bro rename to testing/btest/bifs/netbios-functions.zeek diff --git a/testing/btest/bifs/order.bro b/testing/btest/bifs/order.zeek similarity index 100% rename from testing/btest/bifs/order.bro rename to testing/btest/bifs/order.zeek diff --git a/testing/btest/bifs/parse_ftp.bro b/testing/btest/bifs/parse_ftp.zeek similarity index 100% rename from testing/btest/bifs/parse_ftp.bro rename to testing/btest/bifs/parse_ftp.zeek diff --git a/testing/btest/bifs/piped_exec.bro b/testing/btest/bifs/piped_exec.zeek similarity index 100% rename from testing/btest/bifs/piped_exec.bro rename to testing/btest/bifs/piped_exec.zeek diff --git a/testing/btest/bifs/ptr_name_to_addr.bro b/testing/btest/bifs/ptr_name_to_addr.zeek similarity index 100% rename from testing/btest/bifs/ptr_name_to_addr.bro rename to testing/btest/bifs/ptr_name_to_addr.zeek diff --git a/testing/btest/bifs/rand.bro b/testing/btest/bifs/rand.zeek similarity index 100% rename from testing/btest/bifs/rand.bro rename to testing/btest/bifs/rand.zeek diff --git a/testing/btest/bifs/raw_bytes_to_v4_addr.bro b/testing/btest/bifs/raw_bytes_to_v4_addr.zeek similarity index 100% rename from testing/btest/bifs/raw_bytes_to_v4_addr.bro rename to testing/btest/bifs/raw_bytes_to_v4_addr.zeek diff --git a/testing/btest/bifs/reading_traces.bro b/testing/btest/bifs/reading_traces.zeek similarity index 100% rename from testing/btest/bifs/reading_traces.bro rename to testing/btest/bifs/reading_traces.zeek diff --git a/testing/btest/bifs/record_type_to_vector.bro b/testing/btest/bifs/record_type_to_vector.zeek similarity index 100% rename from testing/btest/bifs/record_type_to_vector.bro rename to testing/btest/bifs/record_type_to_vector.zeek diff --git a/testing/btest/bifs/records_fields.bro b/testing/btest/bifs/records_fields.zeek similarity index 100% rename from testing/btest/bifs/records_fields.bro rename to testing/btest/bifs/records_fields.zeek diff --git a/testing/btest/bifs/remask_addr.bro b/testing/btest/bifs/remask_addr.zeek similarity index 100% rename from testing/btest/bifs/remask_addr.bro rename to testing/btest/bifs/remask_addr.zeek diff --git a/testing/btest/bifs/resize.bro b/testing/btest/bifs/resize.zeek similarity index 100% rename from testing/btest/bifs/resize.bro rename to testing/btest/bifs/resize.zeek diff --git a/testing/btest/bifs/reverse.bro b/testing/btest/bifs/reverse.zeek similarity index 100% rename from testing/btest/bifs/reverse.bro rename to testing/btest/bifs/reverse.zeek diff --git a/testing/btest/bifs/rotate_file.bro b/testing/btest/bifs/rotate_file.zeek similarity index 100% rename from testing/btest/bifs/rotate_file.bro rename to testing/btest/bifs/rotate_file.zeek diff --git a/testing/btest/bifs/rotate_file_by_name.bro b/testing/btest/bifs/rotate_file_by_name.zeek similarity index 100% rename from testing/btest/bifs/rotate_file_by_name.bro rename to testing/btest/bifs/rotate_file_by_name.zeek diff --git a/testing/btest/bifs/rstrip.bro b/testing/btest/bifs/rstrip.zeek similarity index 100% rename from testing/btest/bifs/rstrip.bro rename to testing/btest/bifs/rstrip.zeek diff --git a/testing/btest/bifs/safe_shell_quote.bro b/testing/btest/bifs/safe_shell_quote.zeek similarity index 100% rename from testing/btest/bifs/safe_shell_quote.bro rename to testing/btest/bifs/safe_shell_quote.zeek diff --git a/testing/btest/bifs/same_object.bro b/testing/btest/bifs/same_object.zeek similarity index 100% rename from testing/btest/bifs/same_object.bro rename to testing/btest/bifs/same_object.zeek diff --git a/testing/btest/bifs/sort.bro b/testing/btest/bifs/sort.zeek similarity index 100% rename from testing/btest/bifs/sort.bro rename to testing/btest/bifs/sort.zeek diff --git a/testing/btest/bifs/sort_string_array.bro b/testing/btest/bifs/sort_string_array.zeek similarity index 100% rename from testing/btest/bifs/sort_string_array.bro rename to testing/btest/bifs/sort_string_array.zeek diff --git a/testing/btest/bifs/split.bro b/testing/btest/bifs/split.zeek similarity index 100% rename from testing/btest/bifs/split.bro rename to testing/btest/bifs/split.zeek diff --git a/testing/btest/bifs/split_string.bro b/testing/btest/bifs/split_string.zeek similarity index 100% rename from testing/btest/bifs/split_string.bro rename to testing/btest/bifs/split_string.zeek diff --git a/testing/btest/bifs/str_shell_escape.bro b/testing/btest/bifs/str_shell_escape.zeek similarity index 100% rename from testing/btest/bifs/str_shell_escape.bro rename to testing/btest/bifs/str_shell_escape.zeek diff --git a/testing/btest/bifs/strcmp.bro b/testing/btest/bifs/strcmp.zeek similarity index 100% rename from testing/btest/bifs/strcmp.bro rename to testing/btest/bifs/strcmp.zeek diff --git a/testing/btest/bifs/strftime.bro b/testing/btest/bifs/strftime.zeek similarity index 100% rename from testing/btest/bifs/strftime.bro rename to testing/btest/bifs/strftime.zeek diff --git a/testing/btest/bifs/string_fill.bro b/testing/btest/bifs/string_fill.zeek similarity index 100% rename from testing/btest/bifs/string_fill.bro rename to testing/btest/bifs/string_fill.zeek diff --git a/testing/btest/bifs/string_to_pattern.bro b/testing/btest/bifs/string_to_pattern.zeek similarity index 100% rename from testing/btest/bifs/string_to_pattern.bro rename to testing/btest/bifs/string_to_pattern.zeek diff --git a/testing/btest/bifs/strip.bro b/testing/btest/bifs/strip.zeek similarity index 100% rename from testing/btest/bifs/strip.bro rename to testing/btest/bifs/strip.zeek diff --git a/testing/btest/bifs/strptime.bro b/testing/btest/bifs/strptime.zeek similarity index 100% rename from testing/btest/bifs/strptime.bro rename to testing/btest/bifs/strptime.zeek diff --git a/testing/btest/bifs/strstr.bro b/testing/btest/bifs/strstr.zeek similarity index 100% rename from testing/btest/bifs/strstr.bro rename to testing/btest/bifs/strstr.zeek diff --git a/testing/btest/bifs/sub.bro b/testing/btest/bifs/sub.zeek similarity index 100% rename from testing/btest/bifs/sub.bro rename to testing/btest/bifs/sub.zeek diff --git a/testing/btest/bifs/subnet_to_addr.bro b/testing/btest/bifs/subnet_to_addr.zeek similarity index 100% rename from testing/btest/bifs/subnet_to_addr.bro rename to testing/btest/bifs/subnet_to_addr.zeek diff --git a/testing/btest/bifs/subnet_version.bro b/testing/btest/bifs/subnet_version.zeek similarity index 100% rename from testing/btest/bifs/subnet_version.bro rename to testing/btest/bifs/subnet_version.zeek diff --git a/testing/btest/bifs/subst_string.bro b/testing/btest/bifs/subst_string.zeek similarity index 100% rename from testing/btest/bifs/subst_string.bro rename to testing/btest/bifs/subst_string.zeek diff --git a/testing/btest/bifs/system.bro b/testing/btest/bifs/system.zeek similarity index 100% rename from testing/btest/bifs/system.bro rename to testing/btest/bifs/system.zeek diff --git a/testing/btest/bifs/system_env.bro b/testing/btest/bifs/system_env.zeek similarity index 100% rename from testing/btest/bifs/system_env.bro rename to testing/btest/bifs/system_env.zeek diff --git a/testing/btest/bifs/to_addr.bro b/testing/btest/bifs/to_addr.zeek similarity index 100% rename from testing/btest/bifs/to_addr.bro rename to testing/btest/bifs/to_addr.zeek diff --git a/testing/btest/bifs/to_count.bro b/testing/btest/bifs/to_count.zeek similarity index 100% rename from testing/btest/bifs/to_count.bro rename to testing/btest/bifs/to_count.zeek diff --git a/testing/btest/bifs/to_double.bro b/testing/btest/bifs/to_double.zeek similarity index 100% rename from testing/btest/bifs/to_double.bro rename to testing/btest/bifs/to_double.zeek diff --git a/testing/btest/bifs/to_double_from_string.bro b/testing/btest/bifs/to_double_from_string.zeek similarity index 100% rename from testing/btest/bifs/to_double_from_string.bro rename to testing/btest/bifs/to_double_from_string.zeek diff --git a/testing/btest/bifs/to_int.bro b/testing/btest/bifs/to_int.zeek similarity index 100% rename from testing/btest/bifs/to_int.bro rename to testing/btest/bifs/to_int.zeek diff --git a/testing/btest/bifs/to_interval.bro b/testing/btest/bifs/to_interval.zeek similarity index 100% rename from testing/btest/bifs/to_interval.bro rename to testing/btest/bifs/to_interval.zeek diff --git a/testing/btest/bifs/to_port.bro b/testing/btest/bifs/to_port.zeek similarity index 100% rename from testing/btest/bifs/to_port.bro rename to testing/btest/bifs/to_port.zeek diff --git a/testing/btest/bifs/to_subnet.bro b/testing/btest/bifs/to_subnet.zeek similarity index 100% rename from testing/btest/bifs/to_subnet.bro rename to testing/btest/bifs/to_subnet.zeek diff --git a/testing/btest/bifs/to_time.bro b/testing/btest/bifs/to_time.zeek similarity index 100% rename from testing/btest/bifs/to_time.bro rename to testing/btest/bifs/to_time.zeek diff --git a/testing/btest/bifs/topk.bro b/testing/btest/bifs/topk.zeek similarity index 100% rename from testing/btest/bifs/topk.bro rename to testing/btest/bifs/topk.zeek diff --git a/testing/btest/bifs/type_name.bro b/testing/btest/bifs/type_name.zeek similarity index 100% rename from testing/btest/bifs/type_name.bro rename to testing/btest/bifs/type_name.zeek diff --git a/testing/btest/bifs/unique_id-pools.bro b/testing/btest/bifs/unique_id-pools.zeek similarity index 87% rename from testing/btest/bifs/unique_id-pools.bro rename to testing/btest/bifs/unique_id-pools.zeek index abdc4b22ba..ba31485dc3 100644 --- a/testing/btest/bifs/unique_id-pools.bro +++ b/testing/btest/bifs/unique_id-pools.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: bro order_base | sort >out.2 # @TEST-EXEC: cmp out.1 out.2 -@TEST-START-FILE order_rand.bro +@TEST-START-FILE order_rand.zeek print unique_id("A-"); print unique_id_from(5, "E-"); @@ -14,7 +14,7 @@ print unique_id_from(5, "F-"); @TEST-END-FILE -@TEST-START-FILE order_base.bro +@TEST-START-FILE order_base.zeek print unique_id("A-"); print unique_id("B-"); diff --git a/testing/btest/bifs/unique_id-rnd.bro b/testing/btest/bifs/unique_id-rnd.zeek similarity index 100% rename from testing/btest/bifs/unique_id-rnd.bro rename to testing/btest/bifs/unique_id-rnd.zeek diff --git a/testing/btest/bifs/unique_id.bro b/testing/btest/bifs/unique_id.zeek similarity index 100% rename from testing/btest/bifs/unique_id.bro rename to testing/btest/bifs/unique_id.zeek diff --git a/testing/btest/bifs/uuid_to_string.bro b/testing/btest/bifs/uuid_to_string.zeek similarity index 100% rename from testing/btest/bifs/uuid_to_string.bro rename to testing/btest/bifs/uuid_to_string.zeek diff --git a/testing/btest/bifs/val_size.bro b/testing/btest/bifs/val_size.zeek similarity index 100% rename from testing/btest/bifs/val_size.bro rename to testing/btest/bifs/val_size.zeek diff --git a/testing/btest/bifs/x509_verify.bro b/testing/btest/bifs/x509_verify.zeek similarity index 100% rename from testing/btest/bifs/x509_verify.bro rename to testing/btest/bifs/x509_verify.zeek diff --git a/testing/btest/broker/connect-on-retry.bro b/testing/btest/broker/connect-on-retry.zeek similarity index 91% rename from testing/btest/broker/connect-on-retry.bro rename to testing/btest/broker/connect-on-retry.zeek index 56e479b7ea..56df29cab1 100644 --- a/testing/btest/broker/connect-on-retry.bro +++ b/testing/btest/broker/connect-on-retry.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek # Using btest's environment settings for connect/listen retry of 1sec. redef exit_only_after_terminate = T; @@ -49,7 +49,7 @@ event pong(msg: string, n: count) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/disconnect.bro b/testing/btest/broker/disconnect.zeek similarity index 82% rename from testing/btest/broker/disconnect.bro rename to testing/btest/broker/disconnect.zeek index 08d80f0441..10a3fbfa69 100644 --- a/testing/btest/broker/disconnect.bro +++ b/testing/btest/broker/disconnect.zeek @@ -1,18 +1,18 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 45 || (btest-bg-wait -k 1 && false) -# @TEST-EXEC: btest-bg-run recv2 "bro -B broker -b ../recv.bro >recv2.out" +# @TEST-EXEC: btest-bg-run recv2 "bro -B broker -b ../recv.zeek >recv2.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff recv2/recv2.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -48,7 +48,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/error.bro b/testing/btest/broker/error.zeek similarity index 88% rename from testing/btest/broker/error.bro rename to testing/btest/broker/error.zeek index aa413ea2ac..a3feac10fb 100644 --- a/testing/btest/broker/error.bro +++ b/testing/btest/broker/error.zeek @@ -1,8 +1,8 @@ -# @TEST-EXEC: bro -B main-loop,broker -b send.bro >send.out +# @TEST-EXEC: bro -B main-loop,broker -b send.zeek >send.out # @TEST-EXEC: btest-diff send.out # -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_event.bro b/testing/btest/broker/remote_event.zeek similarity index 92% rename from testing/btest/broker/remote_event.bro rename to testing/btest/broker/remote_event.zeek index a9e22ec25f..7a4ffec627 100644 --- a/testing/btest/broker/remote_event.bro +++ b/testing/btest/broker/remote_event.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -53,7 +53,7 @@ event pong(msg: string, n: count) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_event_any.bro b/testing/btest/broker/remote_event_any.zeek similarity index 92% rename from testing/btest/broker/remote_event_any.bro rename to testing/btest/broker/remote_event_any.zeek index b45e5017ef..f0bb5713ca 100644 --- a/testing/btest/broker/remote_event_any.bro +++ b/testing/btest/broker/remote_event_any.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -56,7 +56,7 @@ event pong(msg: string, n: any) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_event_auto.bro b/testing/btest/broker/remote_event_auto.zeek similarity index 92% rename from testing/btest/broker/remote_event_auto.bro rename to testing/btest/broker/remote_event_auto.zeek index 04570b9e6d..9917be84f8 100644 --- a/testing/btest/broker/remote_event_auto.bro +++ b/testing/btest/broker/remote_event_auto.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -48,7 +48,7 @@ event pong(msg: string, n: count) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_event_ssl_auth.bro b/testing/btest/broker/remote_event_ssl_auth.zeek similarity index 98% rename from testing/btest/broker/remote_event_ssl_auth.bro rename to testing/btest/broker/remote_event_ssl_auth.zeek index 2422638416..d6c3d779ac 100644 --- a/testing/btest/broker/remote_event_ssl_auth.bro +++ b/testing/btest/broker/remote_event_ssl_auth.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -162,7 +162,7 @@ vq+Zqu15QV9T4BVWKHv0 -----END CERTIFICATE----- @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -210,7 +210,7 @@ event pong(msg: string, n: count) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_event_vector_any.bro b/testing/btest/broker/remote_event_vector_any.zeek similarity index 88% rename from testing/btest/broker/remote_event_vector_any.bro rename to testing/btest/broker/remote_event_vector_any.zeek index 6f03d97c56..e0e3c9f879 100644 --- a/testing/btest/broker/remote_event_vector_any.bro +++ b/testing/btest/broker/remote_event_vector_any.zeek @@ -1,12 +1,12 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -41,7 +41,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/remote_id.bro b/testing/btest/broker/remote_id.zeek similarity index 83% rename from testing/btest/broker/remote_id.bro rename to testing/btest/broker/remote_id.zeek index 62cddb9f25..52fc304364 100644 --- a/testing/btest/broker/remote_id.bro +++ b/testing/btest/broker/remote_id.zeek @@ -1,12 +1,12 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro test_var=newval >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek test_var=newval >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek const test_var = "init" &redef; @@ -29,7 +29,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek const test_var = "init" &redef; diff --git a/testing/btest/broker/remote_log.bro b/testing/btest/broker/remote_log.zeek similarity index 83% rename from testing/btest/broker/remote_log.bro rename to testing/btest/broker/remote_log.zeek index dae89d42b2..2274555cc7 100644 --- a/testing/btest/broker/remote_log.bro +++ b/testing/btest/broker/remote_log.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -9,7 +9,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.bro +@TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -37,10 +37,10 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek -@load ./common.bro +@load ./common event bro_init() { @@ -55,11 +55,11 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek -@load ./common.bro +@load ./common event bro_init() { diff --git a/testing/btest/broker/remote_log_late_join.bro b/testing/btest/broker/remote_log_late_join.zeek similarity index 85% rename from testing/btest/broker/remote_log_late_join.bro rename to testing/btest/broker/remote_log_late_join.zeek index aea7846996..3b3666b98b 100644 --- a/testing/btest/broker/remote_log_late_join.bro +++ b/testing/btest/broker/remote_log_late_join.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -9,7 +9,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.bro +@TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -37,10 +37,10 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek -@load ./common.bro +@load ./common event bro_init() { @@ -55,11 +55,11 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek -@load ./common.bro +@load ./common event doconnect() { diff --git a/testing/btest/broker/remote_log_types.bro b/testing/btest/broker/remote_log_types.zeek similarity index 90% rename from testing/btest/broker/remote_log_types.bro rename to testing/btest/broker/remote_log_types.zeek index 8bbc66eaa2..2d7f56da92 100644 --- a/testing/btest/broker/remote_log_types.bro +++ b/testing/btest/broker/remote_log_types.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -12,7 +12,7 @@ # @TEST-EXEC: cat recv/test.log | grep -v '#close' | grep -v '#open' >recv/test.log.filtered # @TEST-EXEC: diff -u send/test.log.filtered recv/test.log.filtered -@TEST-START-FILE common.bro +@TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -54,9 +54,9 @@ event bro_init() &priority=5 @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek -@load ./common.bro +@load ./common event bro_init() { @@ -71,11 +71,11 @@ event quit_receiver() @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek -@load ./common.bro +@load ./common event bro_init() { diff --git a/testing/btest/broker/ssl_auth_failure.bro b/testing/btest/broker/ssl_auth_failure.zeek similarity index 96% rename from testing/btest/broker/ssl_auth_failure.bro rename to testing/btest/broker/ssl_auth_failure.zeek index bc90d86298..41c79236d4 100644 --- a/testing/btest/broker/ssl_auth_failure.bro +++ b/testing/btest/broker/ssl_auth_failure.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -B broker -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -B broker -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -86,7 +86,7 @@ BTdqMbieumB/zL97iK5baHUFEJ4VRtLQhh/SOXgew/BF8ccpilI= -----END RSA PRIVATE KEY----- @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -130,7 +130,7 @@ event Broker::error(code: Broker::ErrorCode, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/store/clone.bro b/testing/btest/broker/store/clone.zeek similarity index 96% rename from testing/btest/broker/store/clone.bro rename to testing/btest/broker/store/clone.zeek index 5620303410..25021a226f 100644 --- a/testing/btest/broker/store/clone.bro +++ b/testing/btest/broker/store/clone.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run clone "bro -B broker -b ../clone-main.bro >clone.out" -# @TEST-EXEC: btest-bg-run master "bro -B broker -b ../master-main.bro >master.out" +# @TEST-EXEC: btest-bg-run clone "bro -B broker -b ../clone-main.zeek >clone.out" +# @TEST-EXEC: btest-bg-run master "bro -B broker -b ../master-main.zeek >master.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff clone/clone.out # @TEST-EXEC: btest-diff master/master.out -@TEST-START-FILE master-main.bro +@TEST-START-FILE master-main.zeek redef exit_only_after_terminate = T; global query_timeout = 1sec; @@ -75,7 +75,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE clone-main.bro +@TEST-START-FILE clone-main.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/broker/store/local.bro b/testing/btest/broker/store/local.zeek similarity index 100% rename from testing/btest/broker/store/local.bro rename to testing/btest/broker/store/local.zeek diff --git a/testing/btest/broker/store/ops.bro b/testing/btest/broker/store/ops.zeek similarity index 100% rename from testing/btest/broker/store/ops.bro rename to testing/btest/broker/store/ops.zeek diff --git a/testing/btest/broker/store/record.bro b/testing/btest/broker/store/record.zeek similarity index 100% rename from testing/btest/broker/store/record.bro rename to testing/btest/broker/store/record.zeek diff --git a/testing/btest/broker/store/set.bro b/testing/btest/broker/store/set.zeek similarity index 100% rename from testing/btest/broker/store/set.bro rename to testing/btest/broker/store/set.zeek diff --git a/testing/btest/broker/store/sqlite.bro b/testing/btest/broker/store/sqlite.zeek similarity index 100% rename from testing/btest/broker/store/sqlite.bro rename to testing/btest/broker/store/sqlite.zeek diff --git a/testing/btest/broker/store/table.bro b/testing/btest/broker/store/table.zeek similarity index 100% rename from testing/btest/broker/store/table.bro rename to testing/btest/broker/store/table.zeek diff --git a/testing/btest/broker/store/type-conversion.bro b/testing/btest/broker/store/type-conversion.zeek similarity index 100% rename from testing/btest/broker/store/type-conversion.bro rename to testing/btest/broker/store/type-conversion.zeek diff --git a/testing/btest/broker/store/vector.bro b/testing/btest/broker/store/vector.zeek similarity index 100% rename from testing/btest/broker/store/vector.bro rename to testing/btest/broker/store/vector.zeek diff --git a/testing/btest/broker/unpeer.bro b/testing/btest/broker/unpeer.zeek similarity index 89% rename from testing/btest/broker/unpeer.bro rename to testing/btest/broker/unpeer.zeek index b591815955..57bdf0301f 100644 --- a/testing/btest/broker/unpeer.bro +++ b/testing/btest/broker/unpeer.zeek @@ -1,7 +1,7 @@ # @TEST-PORT: BROKER_PORT # -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b ../send.zeek >send.out" # # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -12,7 +12,7 @@ # @TEST-EXEC: btest-diff recv/broker.filtered.log # @TEST-EXEC: btest-diff send/broker.filtered.log -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -51,7 +51,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/core/bits_per_uid.bro b/testing/btest/core/bits_per_uid.zeek similarity index 100% rename from testing/btest/core/bits_per_uid.bro rename to testing/btest/core/bits_per_uid.zeek diff --git a/testing/btest/core/cisco-fabric-path.bro b/testing/btest/core/cisco-fabric-path.zeek similarity index 100% rename from testing/btest/core/cisco-fabric-path.bro rename to testing/btest/core/cisco-fabric-path.zeek diff --git a/testing/btest/core/conn-size-threshold.bro b/testing/btest/core/conn-size-threshold.zeek similarity index 100% rename from testing/btest/core/conn-size-threshold.bro rename to testing/btest/core/conn-size-threshold.zeek diff --git a/testing/btest/core/conn-uid.bro b/testing/btest/core/conn-uid.zeek similarity index 100% rename from testing/btest/core/conn-uid.bro rename to testing/btest/core/conn-uid.zeek diff --git a/testing/btest/core/connection_flip_roles.bro b/testing/btest/core/connection_flip_roles.zeek similarity index 100% rename from testing/btest/core/connection_flip_roles.bro rename to testing/btest/core/connection_flip_roles.zeek diff --git a/testing/btest/core/discarder.bro b/testing/btest/core/discarder.zeek similarity index 88% rename from testing/btest/core/discarder.bro rename to testing/btest/core/discarder.zeek index 9e8f5e7a2f..71b78373e9 100644 --- a/testing/btest/core/discarder.bro +++ b/testing/btest/core/discarder.zeek @@ -1,10 +1,10 @@ -# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-ip.bro >output -# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-tcp.bro >>output -# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-udp.bro >>output -# @TEST-EXEC: bro -b -C -r $TRACES/icmp/icmp-destunreach-udp.pcap discarder-icmp.bro >>output +# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-ip.zeek >output +# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-tcp.zeek >>output +# @TEST-EXEC: bro -b -C -r $TRACES/wikipedia.trace discarder-udp.zeek >>output +# @TEST-EXEC: bro -b -C -r $TRACES/icmp/icmp-destunreach-udp.pcap discarder-icmp.zeek >>output # @TEST-EXEC: btest-diff output -@TEST-START-FILE discarder-ip.bro +@TEST-START-FILE discarder-ip.zeek event bro_init() { @@ -26,7 +26,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-END-FILE -@TEST-START-FILE discarder-tcp.bro +@TEST-START-FILE discarder-tcp.zeek event bro_init() { @@ -48,7 +48,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-END-FILE -@TEST-START-FILE discarder-udp.bro +@TEST-START-FILE discarder-udp.zeek event bro_init() { @@ -70,7 +70,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-END-FILE -@TEST-START-FILE discarder-icmp.bro +@TEST-START-FILE discarder-icmp.zeek event bro_init() { diff --git a/testing/btest/core/div-by-zero.bro b/testing/btest/core/div-by-zero.zeek similarity index 100% rename from testing/btest/core/div-by-zero.bro rename to testing/btest/core/div-by-zero.zeek diff --git a/testing/btest/core/dns-init.bro b/testing/btest/core/dns-init.zeek similarity index 100% rename from testing/btest/core/dns-init.bro rename to testing/btest/core/dns-init.zeek diff --git a/testing/btest/core/embedded-null.bro b/testing/btest/core/embedded-null.zeek similarity index 100% rename from testing/btest/core/embedded-null.bro rename to testing/btest/core/embedded-null.zeek diff --git a/testing/btest/core/enum-redef-exists.bro b/testing/btest/core/enum-redef-exists.zeek similarity index 100% rename from testing/btest/core/enum-redef-exists.bro rename to testing/btest/core/enum-redef-exists.zeek diff --git a/testing/btest/core/erspan.bro b/testing/btest/core/erspan.zeek similarity index 100% rename from testing/btest/core/erspan.bro rename to testing/btest/core/erspan.zeek diff --git a/testing/btest/core/erspanII.bro b/testing/btest/core/erspanII.zeek similarity index 100% rename from testing/btest/core/erspanII.bro rename to testing/btest/core/erspanII.zeek diff --git a/testing/btest/core/erspanIII.bro b/testing/btest/core/erspanIII.zeek similarity index 100% rename from testing/btest/core/erspanIII.bro rename to testing/btest/core/erspanIII.zeek diff --git a/testing/btest/core/ether-addrs.bro b/testing/btest/core/ether-addrs.zeek similarity index 100% rename from testing/btest/core/ether-addrs.bro rename to testing/btest/core/ether-addrs.zeek diff --git a/testing/btest/core/event-arg-reuse.bro b/testing/btest/core/event-arg-reuse.zeek similarity index 100% rename from testing/btest/core/event-arg-reuse.bro rename to testing/btest/core/event-arg-reuse.zeek diff --git a/testing/btest/core/expr-exception.bro b/testing/btest/core/expr-exception.zeek similarity index 100% rename from testing/btest/core/expr-exception.bro rename to testing/btest/core/expr-exception.zeek diff --git a/testing/btest/core/fake_dns.bro b/testing/btest/core/fake_dns.zeek similarity index 100% rename from testing/btest/core/fake_dns.bro rename to testing/btest/core/fake_dns.zeek diff --git a/testing/btest/core/global_opaque_val.bro b/testing/btest/core/global_opaque_val.zeek similarity index 100% rename from testing/btest/core/global_opaque_val.bro rename to testing/btest/core/global_opaque_val.zeek diff --git a/testing/btest/core/history-flip.bro b/testing/btest/core/history-flip.zeek similarity index 100% rename from testing/btest/core/history-flip.bro rename to testing/btest/core/history-flip.zeek diff --git a/testing/btest/core/icmp/icmp_sent.bro b/testing/btest/core/icmp/icmp_sent.zeek similarity index 100% rename from testing/btest/core/icmp/icmp_sent.bro rename to testing/btest/core/icmp/icmp_sent.zeek diff --git a/testing/btest/core/init-error.bro b/testing/btest/core/init-error.zeek similarity index 100% rename from testing/btest/core/init-error.bro rename to testing/btest/core/init-error.zeek diff --git a/testing/btest/core/ip-broken-header.bro b/testing/btest/core/ip-broken-header.zeek similarity index 100% rename from testing/btest/core/ip-broken-header.bro rename to testing/btest/core/ip-broken-header.zeek diff --git a/testing/btest/core/leaks/basic-cluster.bro b/testing/btest/core/leaks/basic-cluster.zeek similarity index 98% rename from testing/btest/core/leaks/basic-cluster.bro rename to testing/btest/core/leaks/basic-cluster.zeek index fa73fb9a96..7e08756bb7 100644 --- a/testing/btest/core/leaks/basic-cluster.bro +++ b/testing/btest/core/leaks/basic-cluster.zeek @@ -12,7 +12,7 @@ # @TEST-EXEC: btest-bg-run worker-2 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro -m %INPUT # @TEST-EXEC: btest-bg-wait 60 -@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"], diff --git a/testing/btest/core/leaks/bloomfilter.bro b/testing/btest/core/leaks/bloomfilter.zeek similarity index 100% rename from testing/btest/core/leaks/bloomfilter.bro rename to testing/btest/core/leaks/bloomfilter.zeek diff --git a/testing/btest/core/leaks/broker/clone_store.bro b/testing/btest/core/leaks/broker/clone_store.zeek similarity index 93% rename from testing/btest/core/leaks/broker/clone_store.bro rename to testing/btest/core/leaks/broker/clone_store.zeek index 68235c7bab..9dc9b6072c 100644 --- a/testing/btest/core/leaks/broker/clone_store.bro +++ b/testing/btest/core/leaks/broker/clone_store.zeek @@ -2,13 +2,13 @@ # @TEST-REQUIRES: bro --help 2>&1 | grep -q mem-leaks # @TEST-GROUP: leaks -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run clone "bro -m -b ../clone.bro >clone.out" -# @TEST-EXEC: btest-bg-run master "bro -b ../master.bro >master.out" +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run clone "bro -m -b ../clone.zeek >clone.out" +# @TEST-EXEC: btest-bg-run master "bro -b ../master.zeek >master.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone/clone.out -@TEST-START-FILE master.bro +@TEST-START-FILE master.zeek redef exit_only_after_terminate = T; global query_timeout = 1sec; @@ -76,7 +76,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE clone.bro +@TEST-START-FILE clone.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/core/leaks/broker/data.bro b/testing/btest/core/leaks/broker/data.zeek similarity index 100% rename from testing/btest/core/leaks/broker/data.bro rename to testing/btest/core/leaks/broker/data.zeek diff --git a/testing/btest/core/leaks/broker/master_store.bro b/testing/btest/core/leaks/broker/master_store.zeek similarity index 100% rename from testing/btest/core/leaks/broker/master_store.bro rename to testing/btest/core/leaks/broker/master_store.zeek diff --git a/testing/btest/core/leaks/broker/remote_event.test b/testing/btest/core/leaks/broker/remote_event.test index 5000bd98d7..972f8cbf93 100644 --- a/testing/btest/core/leaks/broker/remote_event.test +++ b/testing/btest/core/leaks/broker/remote_event.test @@ -2,14 +2,14 @@ # @TEST-REQUIRES: bro --help 2>&1 | grep -q mem-leaks # @TEST-GROUP: leaks -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "bro -m -b ../recv.bro >recv.out" -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "bro -m -b ../send.bro >send.out" +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "bro -m -b ../recv.zeek >recv.out" +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "bro -m -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -43,7 +43,7 @@ event event_handler(msg: string, n: count) @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/core/leaks/broker/remote_log.test b/testing/btest/core/leaks/broker/remote_log.test index 12abc1a313..5f41ba9682 100644 --- a/testing/btest/core/leaks/broker/remote_log.test +++ b/testing/btest/core/leaks/broker/remote_log.test @@ -2,8 +2,8 @@ # @TEST-REQUIRES: bro --help 2>&1 | grep -q mem-leaks # @TEST-GROUP: leaks -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "bro -m -b ../recv.bro >recv.out" -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "bro -m -b ../send.bro >send.out" +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "bro -m -b ../recv.zeek >recv.out" +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "bro -m -b ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.bro +@TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -39,9 +39,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek -@load ./common.bro +@load ./common event bro_init() { @@ -56,9 +56,9 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) @TEST-END-FILE -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek -@load ./common.bro +@load ./common event bro_init() { diff --git a/testing/btest/core/leaks/dns-nsec3.bro b/testing/btest/core/leaks/dns-nsec3.zeek similarity index 100% rename from testing/btest/core/leaks/dns-nsec3.bro rename to testing/btest/core/leaks/dns-nsec3.zeek diff --git a/testing/btest/core/leaks/dns-txt.bro b/testing/btest/core/leaks/dns-txt.zeek similarity index 100% rename from testing/btest/core/leaks/dns-txt.bro rename to testing/btest/core/leaks/dns-txt.zeek diff --git a/testing/btest/core/leaks/dns.bro b/testing/btest/core/leaks/dns.zeek similarity index 100% rename from testing/btest/core/leaks/dns.bro rename to testing/btest/core/leaks/dns.zeek diff --git a/testing/btest/core/leaks/dtls.bro b/testing/btest/core/leaks/dtls.zeek similarity index 100% rename from testing/btest/core/leaks/dtls.bro rename to testing/btest/core/leaks/dtls.zeek diff --git a/testing/btest/core/leaks/exec.test b/testing/btest/core/leaks/exec.test index 4cc8240012..a859c4d4c3 100644 --- a/testing/btest/core/leaks/exec.test +++ b/testing/btest/core/leaks/exec.test @@ -4,10 +4,10 @@ # # @TEST-REQUIRES: bro --help 2>&1 | grep -q mem-leaks # -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -m -b ../exectest.bro +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -m -b ../exectest.zeek # @TEST-EXEC: btest-bg-wait 60 -@TEST-START-FILE exectest.bro +@TEST-START-FILE exectest.zeek @load base/utils/exec redef exit_only_after_terminate = T; diff --git a/testing/btest/core/leaks/file-analysis-http-get.bro b/testing/btest/core/leaks/file-analysis-http-get.zeek similarity index 95% rename from testing/btest/core/leaks/file-analysis-http-get.bro rename to testing/btest/core/leaks/file-analysis-http-get.zeek index 29aa6535a3..960a510137 100644 --- a/testing/btest/core/leaks/file-analysis-http-get.bro +++ b/testing/btest/core/leaks/file-analysis-http-get.zeek @@ -4,7 +4,7 @@ # # @TEST-GROUP: leaks # -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -m -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.bro %INPUT +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -m -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT # @TEST-EXEC: btest-bg-wait 60 redef test_file_analysis_source = "HTTP"; diff --git a/testing/btest/core/leaks/hll_cluster.bro b/testing/btest/core/leaks/hll_cluster.zeek similarity index 98% rename from testing/btest/core/leaks/hll_cluster.bro rename to testing/btest/core/leaks/hll_cluster.zeek index e565778fbc..613e458985 100644 --- a/testing/btest/core/leaks/hll_cluster.bro +++ b/testing/btest/core/leaks/hll_cluster.zeek @@ -17,7 +17,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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], diff --git a/testing/btest/core/leaks/hook.bro b/testing/btest/core/leaks/hook.zeek similarity index 100% rename from testing/btest/core/leaks/hook.bro rename to testing/btest/core/leaks/hook.zeek diff --git a/testing/btest/core/leaks/http-connect.bro b/testing/btest/core/leaks/http-connect.zeek similarity index 100% rename from testing/btest/core/leaks/http-connect.bro rename to testing/btest/core/leaks/http-connect.zeek diff --git a/testing/btest/core/leaks/input-basic.bro b/testing/btest/core/leaks/input-basic.zeek similarity index 100% rename from testing/btest/core/leaks/input-basic.bro rename to testing/btest/core/leaks/input-basic.zeek diff --git a/testing/btest/core/leaks/input-errors.bro b/testing/btest/core/leaks/input-errors.zeek similarity index 100% rename from testing/btest/core/leaks/input-errors.bro rename to testing/btest/core/leaks/input-errors.zeek diff --git a/testing/btest/core/leaks/input-missing-enum.bro b/testing/btest/core/leaks/input-missing-enum.zeek similarity index 100% rename from testing/btest/core/leaks/input-missing-enum.bro rename to testing/btest/core/leaks/input-missing-enum.zeek diff --git a/testing/btest/core/leaks/input-optional-event.bro b/testing/btest/core/leaks/input-optional-event.zeek similarity index 100% rename from testing/btest/core/leaks/input-optional-event.bro rename to testing/btest/core/leaks/input-optional-event.zeek diff --git a/testing/btest/core/leaks/input-optional-table.bro b/testing/btest/core/leaks/input-optional-table.zeek similarity index 100% rename from testing/btest/core/leaks/input-optional-table.bro rename to testing/btest/core/leaks/input-optional-table.zeek diff --git a/testing/btest/core/leaks/input-raw.bro b/testing/btest/core/leaks/input-raw.zeek similarity index 100% rename from testing/btest/core/leaks/input-raw.bro rename to testing/btest/core/leaks/input-raw.zeek diff --git a/testing/btest/core/leaks/input-reread.bro b/testing/btest/core/leaks/input-reread.zeek similarity index 100% rename from testing/btest/core/leaks/input-reread.bro rename to testing/btest/core/leaks/input-reread.zeek diff --git a/testing/btest/core/leaks/input-sqlite.bro b/testing/btest/core/leaks/input-sqlite.zeek similarity index 100% rename from testing/btest/core/leaks/input-sqlite.bro rename to testing/btest/core/leaks/input-sqlite.zeek diff --git a/testing/btest/core/leaks/input-with-remove.bro b/testing/btest/core/leaks/input-with-remove.zeek similarity index 100% rename from testing/btest/core/leaks/input-with-remove.bro rename to testing/btest/core/leaks/input-with-remove.zeek diff --git a/testing/btest/core/leaks/kv-iteration.bro b/testing/btest/core/leaks/kv-iteration.zeek similarity index 100% rename from testing/btest/core/leaks/kv-iteration.bro rename to testing/btest/core/leaks/kv-iteration.zeek diff --git a/testing/btest/core/leaks/pattern.bro b/testing/btest/core/leaks/pattern.zeek similarity index 100% rename from testing/btest/core/leaks/pattern.bro rename to testing/btest/core/leaks/pattern.zeek diff --git a/testing/btest/core/leaks/returnwhen.bro b/testing/btest/core/leaks/returnwhen.zeek similarity index 100% rename from testing/btest/core/leaks/returnwhen.bro rename to testing/btest/core/leaks/returnwhen.zeek diff --git a/testing/btest/core/leaks/set.bro b/testing/btest/core/leaks/set.zeek similarity index 100% rename from testing/btest/core/leaks/set.bro rename to testing/btest/core/leaks/set.zeek diff --git a/testing/btest/core/leaks/snmp.test b/testing/btest/core/leaks/snmp.test index 4f212d2699..43112eb9bf 100644 --- a/testing/btest/core/leaks/snmp.test +++ b/testing/btest/core/leaks/snmp.test @@ -4,7 +4,7 @@ # # @TEST-GROUP: leaks # -# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -b -m -r $TRACES/snmp/snmpv1_get.pcap -r $TRACES/snmp/snmpv1_get_short.pcap -r $TRACES/snmp/snmpv1_set.pcap -r $TRACES/snmp/snmpv1_trap.pcap -r $TRACES/snmp/snmpv2_get_bulk.pcap -r $TRACES/snmp/snmpv2_get_next.pcap -r $TRACES/snmp/snmpv2_get.pcap -r $TRACES/snmp/snmpv3_get_next.pcap $SCRIPTS/snmp-test.bro %INPUT +# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -b -m -r $TRACES/snmp/snmpv1_get.pcap -r $TRACES/snmp/snmpv1_get_short.pcap -r $TRACES/snmp/snmpv1_set.pcap -r $TRACES/snmp/snmpv1_trap.pcap -r $TRACES/snmp/snmpv2_get_bulk.pcap -r $TRACES/snmp/snmpv2_get_next.pcap -r $TRACES/snmp/snmpv2_get.pcap -r $TRACES/snmp/snmpv3_get_next.pcap $SCRIPTS/snmp-test.zeek %INPUT # @TEST-EXEC: btest-bg-wait 60 @load base/protocols/snmp diff --git a/testing/btest/core/leaks/stats.bro b/testing/btest/core/leaks/stats.zeek similarity index 92% rename from testing/btest/core/leaks/stats.bro rename to testing/btest/core/leaks/stats.zeek index a3459fdc93..7df104be95 100644 --- a/testing/btest/core/leaks/stats.bro +++ b/testing/btest/core/leaks/stats.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run bro bro -m -r $TRACES/wikipedia.trace %INPUT # @TEST-EXEC: btest-bg-wait 60 -@load policy/misc/stats.bro +@load policy/misc/stats event load_sample(samples: load_sample_info, CPU: interval, dmem: int) { diff --git a/testing/btest/core/leaks/string-indexing.bro b/testing/btest/core/leaks/string-indexing.zeek similarity index 100% rename from testing/btest/core/leaks/string-indexing.bro rename to testing/btest/core/leaks/string-indexing.zeek diff --git a/testing/btest/core/leaks/switch-statement.bro b/testing/btest/core/leaks/switch-statement.zeek similarity index 100% rename from testing/btest/core/leaks/switch-statement.bro rename to testing/btest/core/leaks/switch-statement.zeek diff --git a/testing/btest/core/leaks/teredo.bro b/testing/btest/core/leaks/teredo.zeek similarity index 100% rename from testing/btest/core/leaks/teredo.bro rename to testing/btest/core/leaks/teredo.zeek diff --git a/testing/btest/core/leaks/test-all.bro b/testing/btest/core/leaks/test-all.zeek similarity index 100% rename from testing/btest/core/leaks/test-all.bro rename to testing/btest/core/leaks/test-all.zeek diff --git a/testing/btest/core/leaks/while.bro b/testing/btest/core/leaks/while.zeek similarity index 100% rename from testing/btest/core/leaks/while.bro rename to testing/btest/core/leaks/while.zeek diff --git a/testing/btest/core/leaks/x509_ocsp_verify.bro b/testing/btest/core/leaks/x509_ocsp_verify.zeek similarity index 100% rename from testing/btest/core/leaks/x509_ocsp_verify.bro rename to testing/btest/core/leaks/x509_ocsp_verify.zeek diff --git a/testing/btest/core/leaks/x509_verify.bro b/testing/btest/core/leaks/x509_verify.zeek similarity index 100% rename from testing/btest/core/leaks/x509_verify.bro rename to testing/btest/core/leaks/x509_verify.zeek diff --git a/testing/btest/core/load-duplicates.bro b/testing/btest/core/load-duplicates.zeek similarity index 100% rename from testing/btest/core/load-duplicates.bro rename to testing/btest/core/load-duplicates.zeek diff --git a/testing/btest/core/load-file-extension.bro b/testing/btest/core/load-file-extension.zeek similarity index 100% rename from testing/btest/core/load-file-extension.bro rename to testing/btest/core/load-file-extension.zeek diff --git a/testing/btest/core/load-pkg.bro b/testing/btest/core/load-pkg.zeek similarity index 100% rename from testing/btest/core/load-pkg.bro rename to testing/btest/core/load-pkg.zeek diff --git a/testing/btest/core/load-prefixes.bro b/testing/btest/core/load-prefixes.zeek similarity index 95% rename from testing/btest/core/load-prefixes.bro rename to testing/btest/core/load-prefixes.zeek index 5147bd0250..c91f278a65 100644 --- a/testing/btest/core/load-prefixes.bro +++ b/testing/btest/core/load-prefixes.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: bro addprefixes >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE addprefixes.bro +@TEST-START-FILE addprefixes.zeek @prefixes += lcl @prefixes += lcl2 @TEST-END-FILE diff --git a/testing/btest/core/load-relative.bro b/testing/btest/core/load-relative.zeek similarity index 74% rename from testing/btest/core/load-relative.bro rename to testing/btest/core/load-relative.zeek index 3bd082cf8a..439563c201 100644 --- a/testing/btest/core/load-relative.bro +++ b/testing/btest/core/load-relative.zeek @@ -3,16 +3,16 @@ # @TEST-EXEC: bro -b foo/foo >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE foo/foo.bro +@TEST-START-FILE foo/foo.zeek @load ./bar @load ../baz print "foo loaded"; @TEST-END-FILE -@TEST-START-FILE foo/bar.bro +@TEST-START-FILE foo/bar.zeek print "bar loaded"; @TEST-END-FILE -@TEST-START-FILE baz.bro +@TEST-START-FILE baz.zeek print "baz loaded"; @TEST-END-FILE diff --git a/testing/btest/core/load-unload.bro b/testing/btest/core/load-unload.zeek similarity index 100% rename from testing/btest/core/load-unload.bro rename to testing/btest/core/load-unload.zeek diff --git a/testing/btest/core/mpls-in-vlan.bro b/testing/btest/core/mpls-in-vlan.zeek similarity index 100% rename from testing/btest/core/mpls-in-vlan.bro rename to testing/btest/core/mpls-in-vlan.zeek diff --git a/testing/btest/core/nflog.bro b/testing/btest/core/nflog.zeek similarity index 100% rename from testing/btest/core/nflog.bro rename to testing/btest/core/nflog.zeek diff --git a/testing/btest/core/nop.bro b/testing/btest/core/nop.zeek similarity index 100% rename from testing/btest/core/nop.bro rename to testing/btest/core/nop.zeek diff --git a/testing/btest/core/old_comm_usage.bro b/testing/btest/core/old_comm_usage.zeek similarity index 100% rename from testing/btest/core/old_comm_usage.bro rename to testing/btest/core/old_comm_usage.zeek diff --git a/testing/btest/core/option-errors.bro b/testing/btest/core/option-errors.zeek similarity index 100% rename from testing/btest/core/option-errors.bro rename to testing/btest/core/option-errors.zeek diff --git a/testing/btest/core/option-priorities.bro b/testing/btest/core/option-priorities.zeek similarity index 100% rename from testing/btest/core/option-priorities.bro rename to testing/btest/core/option-priorities.zeek diff --git a/testing/btest/core/option-redef.bro b/testing/btest/core/option-redef.zeek similarity index 100% rename from testing/btest/core/option-redef.bro rename to testing/btest/core/option-redef.zeek diff --git a/testing/btest/core/option-runtime-errors.bro b/testing/btest/core/option-runtime-errors.zeek similarity index 100% rename from testing/btest/core/option-runtime-errors.bro rename to testing/btest/core/option-runtime-errors.zeek diff --git a/testing/btest/core/pcap/dumper.bro b/testing/btest/core/pcap/dumper.zeek similarity index 100% rename from testing/btest/core/pcap/dumper.bro rename to testing/btest/core/pcap/dumper.zeek diff --git a/testing/btest/core/pcap/dynamic-filter.bro b/testing/btest/core/pcap/dynamic-filter.zeek similarity index 100% rename from testing/btest/core/pcap/dynamic-filter.bro rename to testing/btest/core/pcap/dynamic-filter.zeek diff --git a/testing/btest/core/pcap/filter-error.bro b/testing/btest/core/pcap/filter-error.zeek similarity index 100% rename from testing/btest/core/pcap/filter-error.bro rename to testing/btest/core/pcap/filter-error.zeek diff --git a/testing/btest/core/pcap/input-error.bro b/testing/btest/core/pcap/input-error.zeek similarity index 100% rename from testing/btest/core/pcap/input-error.bro rename to testing/btest/core/pcap/input-error.zeek diff --git a/testing/btest/core/pcap/pseudo-realtime.bro b/testing/btest/core/pcap/pseudo-realtime.zeek similarity index 100% rename from testing/btest/core/pcap/pseudo-realtime.bro rename to testing/btest/core/pcap/pseudo-realtime.zeek diff --git a/testing/btest/core/pcap/read-trace-with-filter.bro b/testing/btest/core/pcap/read-trace-with-filter.zeek similarity index 100% rename from testing/btest/core/pcap/read-trace-with-filter.bro rename to testing/btest/core/pcap/read-trace-with-filter.zeek diff --git a/testing/btest/core/pppoe-over-qinq.bro b/testing/btest/core/pppoe-over-qinq.zeek similarity index 100% rename from testing/btest/core/pppoe-over-qinq.bro rename to testing/btest/core/pppoe-over-qinq.zeek diff --git a/testing/btest/core/print-bpf-filters.bro b/testing/btest/core/print-bpf-filters.zeek similarity index 100% rename from testing/btest/core/print-bpf-filters.bro rename to testing/btest/core/print-bpf-filters.zeek diff --git a/testing/btest/core/q-in-q.bro b/testing/btest/core/q-in-q.zeek similarity index 100% rename from testing/btest/core/q-in-q.bro rename to testing/btest/core/q-in-q.zeek diff --git a/testing/btest/core/radiotap.bro b/testing/btest/core/radiotap.zeek similarity index 100% rename from testing/btest/core/radiotap.bro rename to testing/btest/core/radiotap.zeek diff --git a/testing/btest/core/raw_packet.bro b/testing/btest/core/raw_packet.zeek similarity index 100% rename from testing/btest/core/raw_packet.bro rename to testing/btest/core/raw_packet.zeek diff --git a/testing/btest/core/reassembly.bro b/testing/btest/core/reassembly.zeek similarity index 100% rename from testing/btest/core/reassembly.bro rename to testing/btest/core/reassembly.zeek diff --git a/testing/btest/core/recursive-event.bro b/testing/btest/core/recursive-event.zeek similarity index 100% rename from testing/btest/core/recursive-event.bro rename to testing/btest/core/recursive-event.zeek diff --git a/testing/btest/core/reporter-error-in-handler.bro b/testing/btest/core/reporter-error-in-handler.zeek similarity index 100% rename from testing/btest/core/reporter-error-in-handler.bro rename to testing/btest/core/reporter-error-in-handler.zeek diff --git a/testing/btest/core/reporter-fmt-strings.bro b/testing/btest/core/reporter-fmt-strings.zeek similarity index 100% rename from testing/btest/core/reporter-fmt-strings.bro rename to testing/btest/core/reporter-fmt-strings.zeek diff --git a/testing/btest/core/reporter-parse-error.bro b/testing/btest/core/reporter-parse-error.zeek similarity index 100% rename from testing/btest/core/reporter-parse-error.bro rename to testing/btest/core/reporter-parse-error.zeek diff --git a/testing/btest/core/reporter-runtime-error.bro b/testing/btest/core/reporter-runtime-error.zeek similarity index 100% rename from testing/btest/core/reporter-runtime-error.bro rename to testing/btest/core/reporter-runtime-error.zeek diff --git a/testing/btest/core/reporter-shutdown-order-errors.bro b/testing/btest/core/reporter-shutdown-order-errors.zeek similarity index 100% rename from testing/btest/core/reporter-shutdown-order-errors.bro rename to testing/btest/core/reporter-shutdown-order-errors.zeek diff --git a/testing/btest/core/reporter-type-mismatch.bro b/testing/btest/core/reporter-type-mismatch.zeek similarity index 100% rename from testing/btest/core/reporter-type-mismatch.bro rename to testing/btest/core/reporter-type-mismatch.zeek diff --git a/testing/btest/core/reporter-weird-sampling-disable.bro b/testing/btest/core/reporter-weird-sampling-disable.zeek similarity index 100% rename from testing/btest/core/reporter-weird-sampling-disable.bro rename to testing/btest/core/reporter-weird-sampling-disable.zeek diff --git a/testing/btest/core/reporter-weird-sampling.bro b/testing/btest/core/reporter-weird-sampling.zeek similarity index 100% rename from testing/btest/core/reporter-weird-sampling.bro rename to testing/btest/core/reporter-weird-sampling.zeek diff --git a/testing/btest/core/reporter.bro b/testing/btest/core/reporter.zeek similarity index 100% rename from testing/btest/core/reporter.bro rename to testing/btest/core/reporter.zeek diff --git a/testing/btest/core/tcp/fin-retransmit.bro b/testing/btest/core/tcp/fin-retransmit.zeek similarity index 100% rename from testing/btest/core/tcp/fin-retransmit.bro rename to testing/btest/core/tcp/fin-retransmit.zeek diff --git a/testing/btest/core/tcp/large-file-reassembly.bro b/testing/btest/core/tcp/large-file-reassembly.zeek similarity index 100% rename from testing/btest/core/tcp/large-file-reassembly.bro rename to testing/btest/core/tcp/large-file-reassembly.zeek diff --git a/testing/btest/core/tcp/miss-end-data.bro b/testing/btest/core/tcp/miss-end-data.zeek similarity index 100% rename from testing/btest/core/tcp/miss-end-data.bro rename to testing/btest/core/tcp/miss-end-data.zeek diff --git a/testing/btest/core/tcp/missing-syn.bro b/testing/btest/core/tcp/missing-syn.zeek similarity index 100% rename from testing/btest/core/tcp/missing-syn.bro rename to testing/btest/core/tcp/missing-syn.zeek diff --git a/testing/btest/core/tcp/quantum-insert.bro b/testing/btest/core/tcp/quantum-insert.zeek similarity index 100% rename from testing/btest/core/tcp/quantum-insert.bro rename to testing/btest/core/tcp/quantum-insert.zeek diff --git a/testing/btest/core/tcp/rst-after-syn.bro b/testing/btest/core/tcp/rst-after-syn.zeek similarity index 100% rename from testing/btest/core/tcp/rst-after-syn.bro rename to testing/btest/core/tcp/rst-after-syn.zeek diff --git a/testing/btest/core/tcp/rxmit-history.bro b/testing/btest/core/tcp/rxmit-history.zeek similarity index 100% rename from testing/btest/core/tcp/rxmit-history.bro rename to testing/btest/core/tcp/rxmit-history.zeek diff --git a/testing/btest/core/tcp/truncated-header.bro b/testing/btest/core/tcp/truncated-header.zeek similarity index 100% rename from testing/btest/core/tcp/truncated-header.bro rename to testing/btest/core/tcp/truncated-header.zeek diff --git a/testing/btest/core/tunnels/false-teredo.bro b/testing/btest/core/tunnels/false-teredo.zeek similarity index 100% rename from testing/btest/core/tunnels/false-teredo.bro rename to testing/btest/core/tunnels/false-teredo.zeek diff --git a/testing/btest/core/tunnels/ip-in-ip-version.bro b/testing/btest/core/tunnels/ip-in-ip-version.zeek similarity index 100% rename from testing/btest/core/tunnels/ip-in-ip-version.bro rename to testing/btest/core/tunnels/ip-in-ip-version.zeek diff --git a/testing/btest/core/tunnels/teredo.bro b/testing/btest/core/tunnels/teredo.zeek similarity index 100% rename from testing/btest/core/tunnels/teredo.bro rename to testing/btest/core/tunnels/teredo.zeek diff --git a/testing/btest/core/tunnels/vxlan.bro b/testing/btest/core/tunnels/vxlan.zeek similarity index 100% rename from testing/btest/core/tunnels/vxlan.bro rename to testing/btest/core/tunnels/vxlan.zeek diff --git a/testing/btest/core/vector-assignment.bro b/testing/btest/core/vector-assignment.zeek similarity index 100% rename from testing/btest/core/vector-assignment.bro rename to testing/btest/core/vector-assignment.zeek diff --git a/testing/btest/core/vlan-mpls.bro b/testing/btest/core/vlan-mpls.zeek similarity index 100% rename from testing/btest/core/vlan-mpls.bro rename to testing/btest/core/vlan-mpls.zeek diff --git a/testing/btest/core/when-interpreter-exceptions.bro b/testing/btest/core/when-interpreter-exceptions.zeek similarity index 100% rename from testing/btest/core/when-interpreter-exceptions.bro rename to testing/btest/core/when-interpreter-exceptions.zeek diff --git a/testing/btest/core/wlanmon.bro b/testing/btest/core/wlanmon.zeek similarity index 100% rename from testing/btest/core/wlanmon.bro rename to testing/btest/core/wlanmon.zeek diff --git a/testing/btest/core/x509-generalizedtime.bro b/testing/btest/core/x509-generalizedtime.zeek similarity index 100% rename from testing/btest/core/x509-generalizedtime.bro rename to testing/btest/core/x509-generalizedtime.zeek diff --git a/testing/btest/coverage/coverage-blacklist.bro b/testing/btest/coverage/coverage-blacklist.zeek similarity index 100% rename from testing/btest/coverage/coverage-blacklist.bro rename to testing/btest/coverage/coverage-blacklist.zeek diff --git a/testing/btest/doc/broxygen/command_line.bro b/testing/btest/doc/broxygen/command_line.zeek similarity index 100% rename from testing/btest/doc/broxygen/command_line.bro rename to testing/btest/doc/broxygen/command_line.zeek diff --git a/testing/btest/doc/broxygen/comment_retrieval_bifs.bro b/testing/btest/doc/broxygen/comment_retrieval_bifs.zeek similarity index 100% rename from testing/btest/doc/broxygen/comment_retrieval_bifs.bro rename to testing/btest/doc/broxygen/comment_retrieval_bifs.zeek diff --git a/testing/btest/doc/broxygen/enums.bro b/testing/btest/doc/broxygen/enums.zeek similarity index 100% rename from testing/btest/doc/broxygen/enums.bro rename to testing/btest/doc/broxygen/enums.zeek diff --git a/testing/btest/doc/broxygen/example.bro b/testing/btest/doc/broxygen/example.zeek similarity index 100% rename from testing/btest/doc/broxygen/example.bro rename to testing/btest/doc/broxygen/example.zeek diff --git a/testing/btest/doc/broxygen/func-params.bro b/testing/btest/doc/broxygen/func-params.zeek similarity index 100% rename from testing/btest/doc/broxygen/func-params.bro rename to testing/btest/doc/broxygen/func-params.zeek diff --git a/testing/btest/doc/broxygen/identifier.bro b/testing/btest/doc/broxygen/identifier.zeek similarity index 100% rename from testing/btest/doc/broxygen/identifier.bro rename to testing/btest/doc/broxygen/identifier.zeek diff --git a/testing/btest/doc/broxygen/package.bro b/testing/btest/doc/broxygen/package.zeek similarity index 100% rename from testing/btest/doc/broxygen/package.bro rename to testing/btest/doc/broxygen/package.zeek diff --git a/testing/btest/doc/broxygen/package_index.bro b/testing/btest/doc/broxygen/package_index.zeek similarity index 100% rename from testing/btest/doc/broxygen/package_index.bro rename to testing/btest/doc/broxygen/package_index.zeek diff --git a/testing/btest/doc/broxygen/records.bro b/testing/btest/doc/broxygen/records.zeek similarity index 100% rename from testing/btest/doc/broxygen/records.bro rename to testing/btest/doc/broxygen/records.zeek diff --git a/testing/btest/doc/broxygen/script_index.bro b/testing/btest/doc/broxygen/script_index.zeek similarity index 100% rename from testing/btest/doc/broxygen/script_index.bro rename to testing/btest/doc/broxygen/script_index.zeek diff --git a/testing/btest/doc/broxygen/script_summary.bro b/testing/btest/doc/broxygen/script_summary.zeek similarity index 100% rename from testing/btest/doc/broxygen/script_summary.bro rename to testing/btest/doc/broxygen/script_summary.zeek diff --git a/testing/btest/doc/broxygen/type-aliases.bro b/testing/btest/doc/broxygen/type-aliases.zeek similarity index 100% rename from testing/btest/doc/broxygen/type-aliases.bro rename to testing/btest/doc/broxygen/type-aliases.zeek diff --git a/testing/btest/doc/broxygen/vectors.bro b/testing/btest/doc/broxygen/vectors.zeek similarity index 100% rename from testing/btest/doc/broxygen/vectors.bro rename to testing/btest/doc/broxygen/vectors.zeek diff --git a/testing/btest/doc/record-add.bro b/testing/btest/doc/record-add.zeek similarity index 100% rename from testing/btest/doc/record-add.bro rename to testing/btest/doc/record-add.zeek diff --git a/testing/btest/doc/record-attr-check.bro b/testing/btest/doc/record-attr-check.zeek similarity index 100% rename from testing/btest/doc/record-attr-check.bro rename to testing/btest/doc/record-attr-check.zeek diff --git a/testing/btest/language/addr.bro b/testing/btest/language/addr.zeek similarity index 100% rename from testing/btest/language/addr.bro rename to testing/btest/language/addr.zeek diff --git a/testing/btest/language/any.bro b/testing/btest/language/any.zeek similarity index 100% rename from testing/btest/language/any.bro rename to testing/btest/language/any.zeek diff --git a/testing/btest/language/at-deprecated.bro b/testing/btest/language/at-deprecated.zeek similarity index 63% rename from testing/btest/language/at-deprecated.bro rename to testing/btest/language/at-deprecated.zeek index dd0f746658..271a918e5e 100644 --- a/testing/btest/language/at-deprecated.bro +++ b/testing/btest/language/at-deprecated.zeek @@ -1,16 +1,16 @@ # @TEST-EXEC: bro -b foo # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr -@TEST-START-FILE foo.bro +@TEST-START-FILE foo.zeek @deprecated @load bar @load baz @TEST-END-FILE -@TEST-START-FILE bar.bro -@deprecated "Use '@load qux.bro' instead" +@TEST-START-FILE bar.zeek +@deprecated "Use '@load qux' instead" @TEST-END-FILE -@TEST-START-FILE baz.bro +@TEST-START-FILE baz.zeek @deprecated @TEST-END-FILE diff --git a/testing/btest/language/at-dir.bro b/testing/btest/language/at-dir.zeek similarity index 75% rename from testing/btest/language/at-dir.bro rename to testing/btest/language/at-dir.zeek index b826e3a5da..a366285a5b 100644 --- a/testing/btest/language/at-dir.bro +++ b/testing/btest/language/at-dir.zeek @@ -1,10 +1,10 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out -# @TEST-EXEC: bro -b ./pathtest.bro >out2 +# @TEST-EXEC: bro -b ./pathtest.zeek >out2 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out2 print @DIR; -@TEST-START-FILE pathtest.bro +@TEST-START-FILE pathtest.zeek print @DIR; @TEST-END-FILE diff --git a/testing/btest/language/at-filename.bro b/testing/btest/language/at-filename.zeek similarity index 100% rename from testing/btest/language/at-filename.bro rename to testing/btest/language/at-filename.zeek diff --git a/testing/btest/language/at-if-event.bro b/testing/btest/language/at-if-event.zeek similarity index 100% rename from testing/btest/language/at-if-event.bro rename to testing/btest/language/at-if-event.zeek diff --git a/testing/btest/language/at-if-invalid.bro b/testing/btest/language/at-if-invalid.zeek similarity index 100% rename from testing/btest/language/at-if-invalid.bro rename to testing/btest/language/at-if-invalid.zeek diff --git a/testing/btest/language/at-if.bro b/testing/btest/language/at-if.zeek similarity index 100% rename from testing/btest/language/at-if.bro rename to testing/btest/language/at-if.zeek diff --git a/testing/btest/language/at-ifdef.bro b/testing/btest/language/at-ifdef.zeek similarity index 100% rename from testing/btest/language/at-ifdef.bro rename to testing/btest/language/at-ifdef.zeek diff --git a/testing/btest/language/at-ifndef.bro b/testing/btest/language/at-ifndef.zeek similarity index 100% rename from testing/btest/language/at-ifndef.bro rename to testing/btest/language/at-ifndef.zeek diff --git a/testing/btest/language/at-load.bro b/testing/btest/language/at-load.zeek similarity index 100% rename from testing/btest/language/at-load.bro rename to testing/btest/language/at-load.zeek diff --git a/testing/btest/language/attr-default-coercion.bro b/testing/btest/language/attr-default-coercion.zeek similarity index 100% rename from testing/btest/language/attr-default-coercion.bro rename to testing/btest/language/attr-default-coercion.zeek diff --git a/testing/btest/language/attr-default-global-set-error.bro b/testing/btest/language/attr-default-global-set-error.zeek similarity index 100% rename from testing/btest/language/attr-default-global-set-error.bro rename to testing/btest/language/attr-default-global-set-error.zeek diff --git a/testing/btest/language/bool.bro b/testing/btest/language/bool.zeek similarity index 100% rename from testing/btest/language/bool.bro rename to testing/btest/language/bool.zeek diff --git a/testing/btest/language/common-mistakes.bro b/testing/btest/language/common-mistakes.zeek similarity index 87% rename from testing/btest/language/common-mistakes.bro rename to testing/btest/language/common-mistakes.zeek index 361aae0ff4..de7d02da23 100644 --- a/testing/btest/language/common-mistakes.bro +++ b/testing/btest/language/common-mistakes.zeek @@ -2,16 +2,16 @@ # handled internally by way of throwing an exception to unwind out # of the current event handler body. -# @TEST-EXEC: bro -b 1.bro >1.out 2>&1 +# @TEST-EXEC: bro -b 1.zeek >1.out 2>&1 # @TEST-EXEC: btest-diff 1.out -# @TEST-EXEC: bro -b 2.bro >2.out 2>&1 +# @TEST-EXEC: bro -b 2.zeek >2.out 2>&1 # @TEST-EXEC: btest-diff 2.out -# @TEST-EXEC: bro -b 3.bro >3.out 2>&1 +# @TEST-EXEC: bro -b 3.zeek >3.out 2>&1 # @TEST-EXEC: btest-diff 3.out -@TEST-START-FILE 1.bro +@TEST-START-FILE 1.zeek type myrec: record { f: string &optional; }; @@ -47,7 +47,7 @@ event bro_init() &priority=-10 } @TEST-END-FILE -@TEST-START-FILE 2.bro +@TEST-START-FILE 2.zeek function foo() { print "in foo"; @@ -74,7 +74,7 @@ event bro_init() @TEST-END-FILE -@TEST-START-FILE 3.bro +@TEST-START-FILE 3.zeek function foo(v: vector of any) { print "in foo"; diff --git a/testing/btest/language/conditional-expression.bro b/testing/btest/language/conditional-expression.zeek similarity index 100% rename from testing/btest/language/conditional-expression.bro rename to testing/btest/language/conditional-expression.zeek diff --git a/testing/btest/language/const.bro b/testing/btest/language/const.zeek similarity index 84% rename from testing/btest/language/const.bro rename to testing/btest/language/const.zeek index ee938e8d45..1c70d4d04b 100644 --- a/testing/btest/language/const.bro +++ b/testing/btest/language/const.zeek @@ -1,12 +1,12 @@ -# @TEST-EXEC: bro -b valid.bro 2>valid.stderr 1>valid.stdout +# @TEST-EXEC: bro -b valid.zeek 2>valid.stderr 1>valid.stdout # @TEST-EXEC: btest-diff valid.stderr # @TEST-EXEC: btest-diff valid.stdout -# @TEST-EXEC-FAIL: bro -b invalid.bro 2>invalid.stderr 1>invalid.stdout +# @TEST-EXEC-FAIL: bro -b invalid.zeek 2>invalid.stderr 1>invalid.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff invalid.stderr # @TEST-EXEC: btest-diff invalid.stdout -@TEST-START-FILE valid.bro +@TEST-START-FILE valid.zeek # First some simple code that should be valid and error-free. function f(c: count) @@ -40,7 +40,7 @@ event bro_init() @TEST-END-FILE -@TEST-START-FILE invalid.bro +@TEST-START-FILE invalid.zeek # Now some const assignments that should generate errors at parse-time. const foo = 0 &redef; diff --git a/testing/btest/language/container-ctor-scope.bro b/testing/btest/language/container-ctor-scope.zeek similarity index 100% rename from testing/btest/language/container-ctor-scope.bro rename to testing/btest/language/container-ctor-scope.zeek diff --git a/testing/btest/language/copy.bro b/testing/btest/language/copy.zeek similarity index 100% rename from testing/btest/language/copy.bro rename to testing/btest/language/copy.zeek diff --git a/testing/btest/language/count.bro b/testing/btest/language/count.zeek similarity index 100% rename from testing/btest/language/count.bro rename to testing/btest/language/count.zeek diff --git a/testing/btest/language/cross-product-init.bro b/testing/btest/language/cross-product-init.zeek similarity index 100% rename from testing/btest/language/cross-product-init.bro rename to testing/btest/language/cross-product-init.zeek diff --git a/testing/btest/language/default-params.bro b/testing/btest/language/default-params.zeek similarity index 100% rename from testing/btest/language/default-params.bro rename to testing/btest/language/default-params.zeek diff --git a/testing/btest/language/delete-field-set.bro b/testing/btest/language/delete-field-set.zeek similarity index 100% rename from testing/btest/language/delete-field-set.bro rename to testing/btest/language/delete-field-set.zeek diff --git a/testing/btest/language/delete-field.bro b/testing/btest/language/delete-field.zeek similarity index 100% rename from testing/btest/language/delete-field.bro rename to testing/btest/language/delete-field.zeek diff --git a/testing/btest/language/deprecated.bro b/testing/btest/language/deprecated.zeek similarity index 100% rename from testing/btest/language/deprecated.bro rename to testing/btest/language/deprecated.zeek diff --git a/testing/btest/language/double.bro b/testing/btest/language/double.zeek similarity index 100% rename from testing/btest/language/double.bro rename to testing/btest/language/double.zeek diff --git a/testing/btest/language/enum-desc.bro b/testing/btest/language/enum-desc.zeek similarity index 100% rename from testing/btest/language/enum-desc.bro rename to testing/btest/language/enum-desc.zeek diff --git a/testing/btest/language/enum-scope.bro b/testing/btest/language/enum-scope.zeek similarity index 100% rename from testing/btest/language/enum-scope.bro rename to testing/btest/language/enum-scope.zeek diff --git a/testing/btest/language/enum.bro b/testing/btest/language/enum.zeek similarity index 100% rename from testing/btest/language/enum.bro rename to testing/btest/language/enum.zeek diff --git a/testing/btest/language/eof-parse-errors.bro b/testing/btest/language/eof-parse-errors.zeek similarity index 55% rename from testing/btest/language/eof-parse-errors.bro rename to testing/btest/language/eof-parse-errors.zeek index a2c6edc66d..58d8eeacc4 100644 --- a/testing/btest/language/eof-parse-errors.bro +++ b/testing/btest/language/eof-parse-errors.zeek @@ -1,9 +1,9 @@ -# @TEST-EXEC-FAIL: bro -b a.bro >output1 2>&1 -# @TEST-EXEC-FAIL: bro -b a.bro b.bro >output2 2>&1 +# @TEST-EXEC-FAIL: bro -b a.zeek >output1 2>&1 +# @TEST-EXEC-FAIL: bro -b a.zeek b.zeek >output2 2>&1 # @TEST-EXEC: btest-diff output1 # @TEST-EXEC: btest-diff output2 -@TEST-START-FILE a.bro +@TEST-START-FILE a.zeek module A; event bro_init() @@ -11,7 +11,7 @@ event bro_init() print "a"; @TEST-END-FILE -@TEST-START-FILE b.bro +@TEST-START-FILE b.zeek module B; event bro_init() diff --git a/testing/btest/language/event-local-var.bro b/testing/btest/language/event-local-var.zeek similarity index 100% rename from testing/btest/language/event-local-var.bro rename to testing/btest/language/event-local-var.zeek diff --git a/testing/btest/language/event.bro b/testing/btest/language/event.zeek similarity index 100% rename from testing/btest/language/event.bro rename to testing/btest/language/event.zeek diff --git a/testing/btest/language/expire-expr-error.bro b/testing/btest/language/expire-expr-error.zeek similarity index 100% rename from testing/btest/language/expire-expr-error.bro rename to testing/btest/language/expire-expr-error.zeek diff --git a/testing/btest/language/expire-func-undef.bro b/testing/btest/language/expire-func-undef.zeek similarity index 100% rename from testing/btest/language/expire-func-undef.bro rename to testing/btest/language/expire-func-undef.zeek diff --git a/testing/btest/language/expire-redef.bro b/testing/btest/language/expire-redef.zeek similarity index 100% rename from testing/btest/language/expire-redef.bro rename to testing/btest/language/expire-redef.zeek diff --git a/testing/btest/language/expire-type-error.bro b/testing/btest/language/expire-type-error.zeek similarity index 100% rename from testing/btest/language/expire-type-error.bro rename to testing/btest/language/expire-type-error.zeek diff --git a/testing/btest/language/expire_func_mod.bro b/testing/btest/language/expire_func_mod.zeek similarity index 100% rename from testing/btest/language/expire_func_mod.bro rename to testing/btest/language/expire_func_mod.zeek diff --git a/testing/btest/language/file.bro b/testing/btest/language/file.zeek similarity index 100% rename from testing/btest/language/file.bro rename to testing/btest/language/file.zeek diff --git a/testing/btest/language/for.bro b/testing/btest/language/for.zeek similarity index 100% rename from testing/btest/language/for.bro rename to testing/btest/language/for.zeek diff --git a/testing/btest/language/func-assignment.bro b/testing/btest/language/func-assignment.zeek similarity index 100% rename from testing/btest/language/func-assignment.bro rename to testing/btest/language/func-assignment.zeek diff --git a/testing/btest/language/function.bro b/testing/btest/language/function.zeek similarity index 100% rename from testing/btest/language/function.bro rename to testing/btest/language/function.zeek diff --git a/testing/btest/language/hook.bro b/testing/btest/language/hook.zeek similarity index 100% rename from testing/btest/language/hook.bro rename to testing/btest/language/hook.zeek diff --git a/testing/btest/language/hook_calls.bro b/testing/btest/language/hook_calls.zeek similarity index 89% rename from testing/btest/language/hook_calls.bro rename to testing/btest/language/hook_calls.zeek index 41ef6f52ae..411e0018bb 100644 --- a/testing/btest/language/hook_calls.bro +++ b/testing/btest/language/hook_calls.zeek @@ -1,11 +1,11 @@ -# @TEST-EXEC: bro -b valid.bro >valid.out +# @TEST-EXEC: bro -b valid.zeek >valid.out # @TEST-EXEC: btest-diff valid.out -# @TEST-EXEC-FAIL: bro -b invalid.bro > invalid.out 2>&1 +# @TEST-EXEC-FAIL: bro -b invalid.zeek > invalid.out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff invalid.out # hook functions must be called using the "hook" keyword as an operator... -@TEST-START-FILE valid.bro +@TEST-START-FILE valid.zeek hook myhook(i: count) { print "myhook()", i; @@ -59,7 +59,7 @@ event bro_init() @TEST-END-FILE -@TEST-START-FILE invalid.bro +@TEST-START-FILE invalid.zeek hook myhook(i: count) { print "myhook()", i; diff --git a/testing/btest/language/if.bro b/testing/btest/language/if.zeek similarity index 100% rename from testing/btest/language/if.bro rename to testing/btest/language/if.zeek diff --git a/testing/btest/language/index-assignment-invalid.bro b/testing/btest/language/index-assignment-invalid.zeek similarity index 100% rename from testing/btest/language/index-assignment-invalid.bro rename to testing/btest/language/index-assignment-invalid.zeek diff --git a/testing/btest/language/init-in-anon-function.bro b/testing/btest/language/init-in-anon-function.zeek similarity index 100% rename from testing/btest/language/init-in-anon-function.bro rename to testing/btest/language/init-in-anon-function.zeek diff --git a/testing/btest/language/int.bro b/testing/btest/language/int.zeek similarity index 100% rename from testing/btest/language/int.bro rename to testing/btest/language/int.zeek diff --git a/testing/btest/language/interval.bro b/testing/btest/language/interval.zeek similarity index 100% rename from testing/btest/language/interval.bro rename to testing/btest/language/interval.zeek diff --git a/testing/btest/language/invalid_index.bro b/testing/btest/language/invalid_index.zeek similarity index 100% rename from testing/btest/language/invalid_index.bro rename to testing/btest/language/invalid_index.zeek diff --git a/testing/btest/language/ipv6-literals.bro b/testing/btest/language/ipv6-literals.zeek similarity index 100% rename from testing/btest/language/ipv6-literals.bro rename to testing/btest/language/ipv6-literals.zeek diff --git a/testing/btest/language/key-value-for.bro b/testing/btest/language/key-value-for.zeek similarity index 100% rename from testing/btest/language/key-value-for.bro rename to testing/btest/language/key-value-for.zeek diff --git a/testing/btest/language/module.bro b/testing/btest/language/module.zeek similarity index 100% rename from testing/btest/language/module.bro rename to testing/btest/language/module.zeek diff --git a/testing/btest/language/named-record-ctors.bro b/testing/btest/language/named-record-ctors.zeek similarity index 100% rename from testing/btest/language/named-record-ctors.bro rename to testing/btest/language/named-record-ctors.zeek diff --git a/testing/btest/language/named-set-ctors.bro b/testing/btest/language/named-set-ctors.zeek similarity index 100% rename from testing/btest/language/named-set-ctors.bro rename to testing/btest/language/named-set-ctors.zeek diff --git a/testing/btest/language/named-table-ctors.bro b/testing/btest/language/named-table-ctors.zeek similarity index 100% rename from testing/btest/language/named-table-ctors.bro rename to testing/btest/language/named-table-ctors.zeek diff --git a/testing/btest/language/named-vector-ctors.bro b/testing/btest/language/named-vector-ctors.zeek similarity index 100% rename from testing/btest/language/named-vector-ctors.bro rename to testing/btest/language/named-vector-ctors.zeek diff --git a/testing/btest/language/nested-sets.bro b/testing/btest/language/nested-sets.zeek similarity index 100% rename from testing/btest/language/nested-sets.bro rename to testing/btest/language/nested-sets.zeek diff --git a/testing/btest/language/next-test.bro b/testing/btest/language/next-test.zeek similarity index 100% rename from testing/btest/language/next-test.bro rename to testing/btest/language/next-test.zeek diff --git a/testing/btest/language/no-module.bro b/testing/btest/language/no-module.zeek similarity index 100% rename from testing/btest/language/no-module.bro rename to testing/btest/language/no-module.zeek diff --git a/testing/btest/language/null-statement.bro b/testing/btest/language/null-statement.zeek similarity index 100% rename from testing/btest/language/null-statement.bro rename to testing/btest/language/null-statement.zeek diff --git a/testing/btest/language/outer_param_binding.bro b/testing/btest/language/outer_param_binding.zeek similarity index 100% rename from testing/btest/language/outer_param_binding.bro rename to testing/btest/language/outer_param_binding.zeek diff --git a/testing/btest/language/pattern.bro b/testing/btest/language/pattern.zeek similarity index 100% rename from testing/btest/language/pattern.bro rename to testing/btest/language/pattern.zeek diff --git a/testing/btest/language/port.bro b/testing/btest/language/port.zeek similarity index 100% rename from testing/btest/language/port.bro rename to testing/btest/language/port.zeek diff --git a/testing/btest/language/precedence.bro b/testing/btest/language/precedence.zeek similarity index 100% rename from testing/btest/language/precedence.bro rename to testing/btest/language/precedence.zeek diff --git a/testing/btest/language/rec-comp-init.bro b/testing/btest/language/rec-comp-init.zeek similarity index 100% rename from testing/btest/language/rec-comp-init.bro rename to testing/btest/language/rec-comp-init.zeek diff --git a/testing/btest/language/rec-nested-opt.bro b/testing/btest/language/rec-nested-opt.zeek similarity index 100% rename from testing/btest/language/rec-nested-opt.bro rename to testing/btest/language/rec-nested-opt.zeek diff --git a/testing/btest/language/rec-of-tbl.bro b/testing/btest/language/rec-of-tbl.zeek similarity index 100% rename from testing/btest/language/rec-of-tbl.bro rename to testing/btest/language/rec-of-tbl.zeek diff --git a/testing/btest/language/rec-table-default.bro b/testing/btest/language/rec-table-default.zeek similarity index 100% rename from testing/btest/language/rec-table-default.bro rename to testing/btest/language/rec-table-default.zeek diff --git a/testing/btest/language/record-bad-ctor.bro b/testing/btest/language/record-bad-ctor.zeek similarity index 100% rename from testing/btest/language/record-bad-ctor.bro rename to testing/btest/language/record-bad-ctor.zeek diff --git a/testing/btest/language/record-bad-ctor2.bro b/testing/btest/language/record-bad-ctor2.zeek similarity index 100% rename from testing/btest/language/record-bad-ctor2.bro rename to testing/btest/language/record-bad-ctor2.zeek diff --git a/testing/btest/language/record-ceorce-orphan.bro b/testing/btest/language/record-ceorce-orphan.zeek similarity index 100% rename from testing/btest/language/record-ceorce-orphan.bro rename to testing/btest/language/record-ceorce-orphan.zeek diff --git a/testing/btest/language/record-coerce-clash.bro b/testing/btest/language/record-coerce-clash.zeek similarity index 100% rename from testing/btest/language/record-coerce-clash.bro rename to testing/btest/language/record-coerce-clash.zeek diff --git a/testing/btest/language/record-default-coercion.bro b/testing/btest/language/record-default-coercion.zeek similarity index 100% rename from testing/btest/language/record-default-coercion.bro rename to testing/btest/language/record-default-coercion.zeek diff --git a/testing/btest/language/record-default-set-mismatch.bro b/testing/btest/language/record-default-set-mismatch.zeek similarity index 100% rename from testing/btest/language/record-default-set-mismatch.bro rename to testing/btest/language/record-default-set-mismatch.zeek diff --git a/testing/btest/language/record-extension.bro b/testing/btest/language/record-extension.zeek similarity index 100% rename from testing/btest/language/record-extension.bro rename to testing/btest/language/record-extension.zeek diff --git a/testing/btest/language/record-function-recursion.bro b/testing/btest/language/record-function-recursion.zeek similarity index 100% rename from testing/btest/language/record-function-recursion.bro rename to testing/btest/language/record-function-recursion.zeek diff --git a/testing/btest/language/record-index-complex-fields.bro b/testing/btest/language/record-index-complex-fields.zeek similarity index 100% rename from testing/btest/language/record-index-complex-fields.bro rename to testing/btest/language/record-index-complex-fields.zeek diff --git a/testing/btest/language/record-recursive-coercion.bro b/testing/btest/language/record-recursive-coercion.zeek similarity index 100% rename from testing/btest/language/record-recursive-coercion.bro rename to testing/btest/language/record-recursive-coercion.zeek diff --git a/testing/btest/language/record-redef-after-init.bro b/testing/btest/language/record-redef-after-init.zeek similarity index 100% rename from testing/btest/language/record-redef-after-init.bro rename to testing/btest/language/record-redef-after-init.zeek diff --git a/testing/btest/language/record-ref-assign.bro b/testing/btest/language/record-ref-assign.zeek similarity index 100% rename from testing/btest/language/record-ref-assign.bro rename to testing/btest/language/record-ref-assign.zeek diff --git a/testing/btest/language/record-type-checking.bro b/testing/btest/language/record-type-checking.zeek similarity index 100% rename from testing/btest/language/record-type-checking.bro rename to testing/btest/language/record-type-checking.zeek diff --git a/testing/btest/language/redef-same-prefixtable-idx.bro b/testing/btest/language/redef-same-prefixtable-idx.zeek similarity index 100% rename from testing/btest/language/redef-same-prefixtable-idx.bro rename to testing/btest/language/redef-same-prefixtable-idx.zeek diff --git a/testing/btest/language/redef-vector.bro b/testing/btest/language/redef-vector.zeek similarity index 100% rename from testing/btest/language/redef-vector.bro rename to testing/btest/language/redef-vector.zeek diff --git a/testing/btest/language/returnwhen.bro b/testing/btest/language/returnwhen.zeek similarity index 100% rename from testing/btest/language/returnwhen.bro rename to testing/btest/language/returnwhen.zeek diff --git a/testing/btest/language/set-opt-record-index.bro b/testing/btest/language/set-opt-record-index.zeek similarity index 100% rename from testing/btest/language/set-opt-record-index.bro rename to testing/btest/language/set-opt-record-index.zeek diff --git a/testing/btest/language/set-type-checking.bro b/testing/btest/language/set-type-checking.zeek similarity index 100% rename from testing/btest/language/set-type-checking.bro rename to testing/btest/language/set-type-checking.zeek diff --git a/testing/btest/language/set.bro b/testing/btest/language/set.zeek similarity index 100% rename from testing/btest/language/set.bro rename to testing/btest/language/set.zeek diff --git a/testing/btest/language/short-circuit.bro b/testing/btest/language/short-circuit.zeek similarity index 100% rename from testing/btest/language/short-circuit.bro rename to testing/btest/language/short-circuit.zeek diff --git a/testing/btest/language/sizeof.bro b/testing/btest/language/sizeof.zeek similarity index 100% rename from testing/btest/language/sizeof.bro rename to testing/btest/language/sizeof.zeek diff --git a/testing/btest/language/smith-waterman-test.bro b/testing/btest/language/smith-waterman-test.zeek similarity index 100% rename from testing/btest/language/smith-waterman-test.bro rename to testing/btest/language/smith-waterman-test.zeek diff --git a/testing/btest/language/string-indexing.bro b/testing/btest/language/string-indexing.zeek similarity index 100% rename from testing/btest/language/string-indexing.bro rename to testing/btest/language/string-indexing.zeek diff --git a/testing/btest/language/string.bro b/testing/btest/language/string.zeek similarity index 100% rename from testing/btest/language/string.bro rename to testing/btest/language/string.zeek diff --git a/testing/btest/language/strings.bro b/testing/btest/language/strings.zeek similarity index 100% rename from testing/btest/language/strings.bro rename to testing/btest/language/strings.zeek diff --git a/testing/btest/language/subnet-errors.bro b/testing/btest/language/subnet-errors.zeek similarity index 100% rename from testing/btest/language/subnet-errors.bro rename to testing/btest/language/subnet-errors.zeek diff --git a/testing/btest/language/subnet.bro b/testing/btest/language/subnet.zeek similarity index 100% rename from testing/btest/language/subnet.bro rename to testing/btest/language/subnet.zeek diff --git a/testing/btest/language/switch-error-mixed.bro b/testing/btest/language/switch-error-mixed.zeek similarity index 100% rename from testing/btest/language/switch-error-mixed.bro rename to testing/btest/language/switch-error-mixed.zeek diff --git a/testing/btest/language/switch-incomplete.bro b/testing/btest/language/switch-incomplete.zeek similarity index 100% rename from testing/btest/language/switch-incomplete.bro rename to testing/btest/language/switch-incomplete.zeek diff --git a/testing/btest/language/switch-statement.bro b/testing/btest/language/switch-statement.zeek similarity index 100% rename from testing/btest/language/switch-statement.bro rename to testing/btest/language/switch-statement.zeek diff --git a/testing/btest/language/switch-types-error-duplicate.bro b/testing/btest/language/switch-types-error-duplicate.zeek similarity index 100% rename from testing/btest/language/switch-types-error-duplicate.bro rename to testing/btest/language/switch-types-error-duplicate.zeek diff --git a/testing/btest/language/switch-types-error-unsupported.bro b/testing/btest/language/switch-types-error-unsupported.zeek similarity index 100% rename from testing/btest/language/switch-types-error-unsupported.bro rename to testing/btest/language/switch-types-error-unsupported.zeek diff --git a/testing/btest/language/switch-types-vars.bro b/testing/btest/language/switch-types-vars.zeek similarity index 100% rename from testing/btest/language/switch-types-vars.bro rename to testing/btest/language/switch-types-vars.zeek diff --git a/testing/btest/language/switch-types.bro b/testing/btest/language/switch-types.zeek similarity index 100% rename from testing/btest/language/switch-types.bro rename to testing/btest/language/switch-types.zeek diff --git a/testing/btest/language/table-default-record.bro b/testing/btest/language/table-default-record.zeek similarity index 100% rename from testing/btest/language/table-default-record.bro rename to testing/btest/language/table-default-record.zeek diff --git a/testing/btest/language/table-init-attrs.bro b/testing/btest/language/table-init-attrs.zeek similarity index 100% rename from testing/btest/language/table-init-attrs.bro rename to testing/btest/language/table-init-attrs.zeek diff --git a/testing/btest/language/table-init-container-ctors.bro b/testing/btest/language/table-init-container-ctors.zeek similarity index 100% rename from testing/btest/language/table-init-container-ctors.bro rename to testing/btest/language/table-init-container-ctors.zeek diff --git a/testing/btest/language/table-init-record-idx.bro b/testing/btest/language/table-init-record-idx.zeek similarity index 100% rename from testing/btest/language/table-init-record-idx.bro rename to testing/btest/language/table-init-record-idx.zeek diff --git a/testing/btest/language/table-init.bro b/testing/btest/language/table-init.zeek similarity index 100% rename from testing/btest/language/table-init.bro rename to testing/btest/language/table-init.zeek diff --git a/testing/btest/language/table-redef.bro b/testing/btest/language/table-redef.zeek similarity index 100% rename from testing/btest/language/table-redef.bro rename to testing/btest/language/table-redef.zeek diff --git a/testing/btest/language/table-type-checking.bro b/testing/btest/language/table-type-checking.zeek similarity index 100% rename from testing/btest/language/table-type-checking.bro rename to testing/btest/language/table-type-checking.zeek diff --git a/testing/btest/language/table.bro b/testing/btest/language/table.zeek similarity index 100% rename from testing/btest/language/table.bro rename to testing/btest/language/table.zeek diff --git a/testing/btest/language/ternary-record-mismatch.bro b/testing/btest/language/ternary-record-mismatch.zeek similarity index 100% rename from testing/btest/language/ternary-record-mismatch.bro rename to testing/btest/language/ternary-record-mismatch.zeek diff --git a/testing/btest/language/time.bro b/testing/btest/language/time.zeek similarity index 100% rename from testing/btest/language/time.bro rename to testing/btest/language/time.zeek diff --git a/testing/btest/language/timeout.bro b/testing/btest/language/timeout.zeek similarity index 100% rename from testing/btest/language/timeout.bro rename to testing/btest/language/timeout.zeek diff --git a/testing/btest/language/type-cast-any.bro b/testing/btest/language/type-cast-any.zeek similarity index 100% rename from testing/btest/language/type-cast-any.bro rename to testing/btest/language/type-cast-any.zeek diff --git a/testing/btest/language/type-cast-error-dynamic.bro b/testing/btest/language/type-cast-error-dynamic.zeek similarity index 100% rename from testing/btest/language/type-cast-error-dynamic.bro rename to testing/btest/language/type-cast-error-dynamic.zeek diff --git a/testing/btest/language/type-cast-error-static.bro b/testing/btest/language/type-cast-error-static.zeek similarity index 100% rename from testing/btest/language/type-cast-error-static.bro rename to testing/btest/language/type-cast-error-static.zeek diff --git a/testing/btest/language/type-cast-same.bro b/testing/btest/language/type-cast-same.zeek similarity index 100% rename from testing/btest/language/type-cast-same.bro rename to testing/btest/language/type-cast-same.zeek diff --git a/testing/btest/language/type-check-any.bro b/testing/btest/language/type-check-any.zeek similarity index 100% rename from testing/btest/language/type-check-any.bro rename to testing/btest/language/type-check-any.zeek diff --git a/testing/btest/language/type-check-vector.bro b/testing/btest/language/type-check-vector.zeek similarity index 100% rename from testing/btest/language/type-check-vector.bro rename to testing/btest/language/type-check-vector.zeek diff --git a/testing/btest/language/type-type-error.bro b/testing/btest/language/type-type-error.zeek similarity index 100% rename from testing/btest/language/type-type-error.bro rename to testing/btest/language/type-type-error.zeek diff --git a/testing/btest/language/undefined-delete-field.bro b/testing/btest/language/undefined-delete-field.zeek similarity index 100% rename from testing/btest/language/undefined-delete-field.bro rename to testing/btest/language/undefined-delete-field.zeek diff --git a/testing/btest/language/uninitialized-local.bro b/testing/btest/language/uninitialized-local.zeek similarity index 100% rename from testing/btest/language/uninitialized-local.bro rename to testing/btest/language/uninitialized-local.zeek diff --git a/testing/btest/language/uninitialized-local2.bro b/testing/btest/language/uninitialized-local2.zeek similarity index 100% rename from testing/btest/language/uninitialized-local2.bro rename to testing/btest/language/uninitialized-local2.zeek diff --git a/testing/btest/language/vector-any-append.bro b/testing/btest/language/vector-any-append.zeek similarity index 100% rename from testing/btest/language/vector-any-append.bro rename to testing/btest/language/vector-any-append.zeek diff --git a/testing/btest/language/vector-coerce-expr.bro b/testing/btest/language/vector-coerce-expr.zeek similarity index 100% rename from testing/btest/language/vector-coerce-expr.bro rename to testing/btest/language/vector-coerce-expr.zeek diff --git a/testing/btest/language/vector-in-operator.bro b/testing/btest/language/vector-in-operator.zeek similarity index 100% rename from testing/btest/language/vector-in-operator.bro rename to testing/btest/language/vector-in-operator.zeek diff --git a/testing/btest/language/vector-list-init-records.bro b/testing/btest/language/vector-list-init-records.zeek similarity index 100% rename from testing/btest/language/vector-list-init-records.bro rename to testing/btest/language/vector-list-init-records.zeek diff --git a/testing/btest/language/vector-type-checking.bro b/testing/btest/language/vector-type-checking.zeek similarity index 100% rename from testing/btest/language/vector-type-checking.bro rename to testing/btest/language/vector-type-checking.zeek diff --git a/testing/btest/language/vector-unspecified.bro b/testing/btest/language/vector-unspecified.zeek similarity index 100% rename from testing/btest/language/vector-unspecified.bro rename to testing/btest/language/vector-unspecified.zeek diff --git a/testing/btest/language/vector.bro b/testing/btest/language/vector.zeek similarity index 100% rename from testing/btest/language/vector.bro rename to testing/btest/language/vector.zeek diff --git a/testing/btest/language/when-unitialized-rhs.bro b/testing/btest/language/when-unitialized-rhs.zeek similarity index 100% rename from testing/btest/language/when-unitialized-rhs.bro rename to testing/btest/language/when-unitialized-rhs.zeek diff --git a/testing/btest/language/when.bro b/testing/btest/language/when.zeek similarity index 100% rename from testing/btest/language/when.bro rename to testing/btest/language/when.zeek diff --git a/testing/btest/language/while.bro b/testing/btest/language/while.zeek similarity index 100% rename from testing/btest/language/while.bro rename to testing/btest/language/while.zeek diff --git a/testing/btest/language/wrong-delete-field.bro b/testing/btest/language/wrong-delete-field.zeek similarity index 100% rename from testing/btest/language/wrong-delete-field.bro rename to testing/btest/language/wrong-delete-field.zeek diff --git a/testing/btest/language/wrong-record-extension.bro b/testing/btest/language/wrong-record-extension.zeek similarity index 100% rename from testing/btest/language/wrong-record-extension.bro rename to testing/btest/language/wrong-record-extension.zeek diff --git a/testing/btest/plugins/file.bro b/testing/btest/plugins/file.zeek similarity index 100% rename from testing/btest/plugins/file.bro rename to testing/btest/plugins/file.zeek diff --git a/testing/btest/plugins/hooks.bro b/testing/btest/plugins/hooks.zeek similarity index 100% rename from testing/btest/plugins/hooks.bro rename to testing/btest/plugins/hooks.zeek diff --git a/testing/btest/plugins/init-plugin.bro b/testing/btest/plugins/init-plugin.zeek similarity index 100% rename from testing/btest/plugins/init-plugin.bro rename to testing/btest/plugins/init-plugin.zeek diff --git a/testing/btest/plugins/logging-hooks.bro b/testing/btest/plugins/logging-hooks.zeek similarity index 100% rename from testing/btest/plugins/logging-hooks.bro rename to testing/btest/plugins/logging-hooks.zeek diff --git a/testing/btest/plugins/pktdumper.bro b/testing/btest/plugins/pktdumper.zeek similarity index 100% rename from testing/btest/plugins/pktdumper.bro rename to testing/btest/plugins/pktdumper.zeek diff --git a/testing/btest/plugins/pktsrc.bro b/testing/btest/plugins/pktsrc.zeek similarity index 100% rename from testing/btest/plugins/pktsrc.bro rename to testing/btest/plugins/pktsrc.zeek diff --git a/testing/btest/plugins/plugin-nopatchversion.bro b/testing/btest/plugins/plugin-nopatchversion.zeek similarity index 100% rename from testing/btest/plugins/plugin-nopatchversion.bro rename to testing/btest/plugins/plugin-nopatchversion.zeek diff --git a/testing/btest/plugins/plugin-withpatchversion.bro b/testing/btest/plugins/plugin-withpatchversion.zeek similarity index 100% rename from testing/btest/plugins/plugin-withpatchversion.bro rename to testing/btest/plugins/plugin-withpatchversion.zeek diff --git a/testing/btest/plugins/protocol-plugin/scripts/Demo/Foo/base/main.bro b/testing/btest/plugins/protocol-plugin/scripts/Demo/Foo/base/main.zeek similarity index 100% rename from testing/btest/plugins/protocol-plugin/scripts/Demo/Foo/base/main.bro rename to testing/btest/plugins/protocol-plugin/scripts/Demo/Foo/base/main.zeek diff --git a/testing/btest/plugins/protocol.bro b/testing/btest/plugins/protocol.zeek similarity index 100% rename from testing/btest/plugins/protocol.bro rename to testing/btest/plugins/protocol.zeek diff --git a/testing/btest/plugins/reader.bro b/testing/btest/plugins/reader.zeek similarity index 100% rename from testing/btest/plugins/reader.bro rename to testing/btest/plugins/reader.zeek diff --git a/testing/btest/plugins/reporter-hook.bro b/testing/btest/plugins/reporter-hook.zeek similarity index 100% rename from testing/btest/plugins/reporter-hook.bro rename to testing/btest/plugins/reporter-hook.zeek diff --git a/testing/btest/plugins/writer.bro b/testing/btest/plugins/writer.zeek similarity index 100% rename from testing/btest/plugins/writer.bro rename to testing/btest/plugins/writer.zeek diff --git a/testing/btest/scripts/base/files/data_event/basic.bro b/testing/btest/scripts/base/files/data_event/basic.zeek similarity index 100% rename from testing/btest/scripts/base/files/data_event/basic.bro rename to testing/btest/scripts/base/files/data_event/basic.zeek diff --git a/testing/btest/scripts/base/files/extract/limit.bro b/testing/btest/scripts/base/files/extract/limit.zeek similarity index 100% rename from testing/btest/scripts/base/files/extract/limit.bro rename to testing/btest/scripts/base/files/extract/limit.zeek diff --git a/testing/btest/scripts/base/files/unified2/alert.bro b/testing/btest/scripts/base/files/unified2/alert.zeek similarity index 100% rename from testing/btest/scripts/base/files/unified2/alert.bro rename to testing/btest/scripts/base/files/unified2/alert.zeek diff --git a/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.bro b/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.bro rename to testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek diff --git a/testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.bro b/testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.bro rename to testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.zeek diff --git a/testing/btest/scripts/base/frameworks/analyzer/register-for-port.bro b/testing/btest/scripts/base/frameworks/analyzer/register-for-port.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/analyzer/register-for-port.bro rename to testing/btest/scripts/base/frameworks/analyzer/register-for-port.zeek diff --git a/testing/btest/scripts/base/frameworks/analyzer/schedule-analyzer.bro b/testing/btest/scripts/base/frameworks/analyzer/schedule-analyzer.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/analyzer/schedule-analyzer.bro rename to testing/btest/scripts/base/frameworks/analyzer/schedule-analyzer.zeek diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.bro b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.bro rename to testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek index dc2558f2a4..6a9cb6ed00 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.bro b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.bro rename to testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek index 08202bd727..fdc291ab35 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/cluster/forwarding.bro b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/forwarding.bro rename to testing/btest/scripts/base/frameworks/cluster/forwarding.zeek index e62a2ced66..7c679277d4 100644 --- a/testing/btest/scripts/base/frameworks/cluster/forwarding.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.bro b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/log_distribution.bro rename to testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek index 199e265674..375665356c 100644 --- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.bro +++ b/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 = { diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.bro b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.bro rename to testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek index d94875e858..c28f3f0fe3 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.bro +++ b/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"))], diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up.bro b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/start-it-up.bro rename to testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek index eee6c29215..4580183d6f 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.bro b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/topic_distribution.bro rename to testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek index 317a38fbaa..94a78e5304 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.bro b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.bro rename to testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek index 35ed52f883..a0b98aeb39 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/config/basic.bro b/testing/btest/scripts/base/frameworks/config/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/config/basic.bro rename to testing/btest/scripts/base/frameworks/config/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.bro b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/config/basic_cluster.bro rename to testing/btest/scripts/base/frameworks/config/basic_cluster.zeek index 99f1de8aeb..866901e752 100644 --- a/testing/btest/scripts/base/frameworks/config/basic_cluster.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.bro b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/config/cluster_resend.bro rename to testing/btest/scripts/base/frameworks/config/cluster_resend.zeek index c66d5b2ba2..6390eda2c0 100644 --- a/testing/btest/scripts/base/frameworks/config/cluster_resend.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/config/read_config.bro b/testing/btest/scripts/base/frameworks/config/read_config.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/config/read_config.bro rename to testing/btest/scripts/base/frameworks/config/read_config.zeek diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/config/read_config_cluster.bro rename to testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek index 3f77a0fdc3..c5b9bcdbb5 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro +++ b/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"], diff --git a/testing/btest/scripts/base/frameworks/config/several-files.bro b/testing/btest/scripts/base/frameworks/config/several-files.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/config/several-files.bro rename to testing/btest/scripts/base/frameworks/config/several-files.zeek diff --git a/testing/btest/scripts/base/frameworks/config/updates.bro b/testing/btest/scripts/base/frameworks/config/updates.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/config/updates.bro rename to testing/btest/scripts/base/frameworks/config/updates.zeek diff --git a/testing/btest/scripts/base/frameworks/config/weird.bro b/testing/btest/scripts/base/frameworks/config/weird.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/config/weird.bro rename to testing/btest/scripts/base/frameworks/config/weird.zeek diff --git a/testing/btest/scripts/base/frameworks/control/configuration_update.bro b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek similarity index 97% rename from testing/btest/scripts/base/frameworks/control/configuration_update.bro rename to testing/btest/scripts/base/frameworks/control/configuration_update.zeek index e90151bcbb..f0bbc6c907 100644 --- a/testing/btest/scripts/base/frameworks/control/configuration_update.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/control/id_value.bro b/testing/btest/scripts/base/frameworks/control/id_value.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/control/id_value.bro rename to testing/btest/scripts/base/frameworks/control/id_value.zeek index 2528b28c25..a557f6487e 100644 --- a/testing/btest/scripts/base/frameworks/control/id_value.bro +++ b/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"; diff --git a/testing/btest/scripts/base/frameworks/control/shutdown.bro b/testing/btest/scripts/base/frameworks/control/shutdown.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/control/shutdown.bro rename to testing/btest/scripts/base/frameworks/control/shutdown.zeek diff --git a/testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.bro b/testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.zeek similarity index 84% rename from testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.bro rename to testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.zeek index bcecbd8aa3..919d3b62c6 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/actions/data_event.bro +++ b/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; diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.bro rename to testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro rename to testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.zeek diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.zeek similarity index 94% rename from testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.bro rename to testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.zeek index a3704618bd..2c6f0a3d07 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/bifs/remove_action.bro +++ b/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"; diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.bro rename to testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.zeek index c9eac4c31d..c44b1ec66b 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/bifs/set_timeout_interval.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.zeek similarity index 86% rename from testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.bro rename to testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.zeek index dd40c69684..cfd2e0c67b 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/bifs/stop.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/big-bof-buffer.bro b/testing/btest/scripts/base/frameworks/file-analysis/big-bof-buffer.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/file-analysis/big-bof-buffer.bro rename to testing/btest/scripts/base/frameworks/file-analysis/big-bof-buffer.zeek diff --git a/testing/btest/scripts/base/frameworks/file-analysis/byteranges.bro b/testing/btest/scripts/base/frameworks/file-analysis/byteranges.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/file-analysis/byteranges.bro rename to testing/btest/scripts/base/frameworks/file-analysis/byteranges.zeek diff --git a/testing/btest/scripts/base/frameworks/file-analysis/ftp.bro b/testing/btest/scripts/base/frameworks/file-analysis/ftp.zeek similarity index 91% rename from testing/btest/scripts/base/frameworks/file-analysis/ftp.bro rename to testing/btest/scripts/base/frameworks/file-analysis/ftp.zeek index 2c2da188fe..a25fde74e5 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/ftp.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/get.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek similarity index 84% rename from testing/btest/scripts/base/frameworks/file-analysis/http/get.bro rename to testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek index f7f4a0395b..d90e08e08b 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/get.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/file-analysis/http/multipart.bro rename to testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek index 57fe2348c2..400b787b52 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.zeek similarity index 87% rename from testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro rename to testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.zeek index 93443f0ca8..bb5ef7f800 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/partial-content.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek similarity index 90% rename from testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.bro rename to testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek index 36743a8bad..cdd69b84a9 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/post.bro b/testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/file-analysis/http/post.bro rename to testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek index 79ac1cb5c1..75efb27781 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/post.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro b/testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro rename to testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek index 053341c840..27be2b943c 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/irc.bro b/testing/btest/scripts/base/frameworks/file-analysis/irc.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/file-analysis/irc.bro rename to testing/btest/scripts/base/frameworks/file-analysis/irc.zeek index 9fd8e06613..a1fd1e36d5 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/irc.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/file-analysis/logging.bro b/testing/btest/scripts/base/frameworks/file-analysis/logging.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/file-analysis/logging.bro rename to testing/btest/scripts/base/frameworks/file-analysis/logging.zeek index 1d1f5fd721..597f8a26bb 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/logging.bro +++ b/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"; diff --git a/testing/btest/scripts/base/frameworks/file-analysis/smtp.bro b/testing/btest/scripts/base/frameworks/file-analysis/smtp.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/file-analysis/smtp.bro rename to testing/btest/scripts/base/frameworks/file-analysis/smtp.zeek index 79b929c4cd..9edec8abc1 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/smtp.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/input/basic.bro b/testing/btest/scripts/base/frameworks/input/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/basic.bro rename to testing/btest/scripts/base/frameworks/input/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/input/bignumber.bro b/testing/btest/scripts/base/frameworks/input/bignumber.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/bignumber.bro rename to testing/btest/scripts/base/frameworks/input/bignumber.zeek diff --git a/testing/btest/scripts/base/frameworks/input/binary.bro b/testing/btest/scripts/base/frameworks/input/binary.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/binary.bro rename to testing/btest/scripts/base/frameworks/input/binary.zeek diff --git a/testing/btest/scripts/base/frameworks/input/config/basic.bro b/testing/btest/scripts/base/frameworks/input/config/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/config/basic.bro rename to testing/btest/scripts/base/frameworks/input/config/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/input/config/errors.bro b/testing/btest/scripts/base/frameworks/input/config/errors.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/config/errors.bro rename to testing/btest/scripts/base/frameworks/input/config/errors.zeek diff --git a/testing/btest/scripts/base/frameworks/input/config/spaces.bro b/testing/btest/scripts/base/frameworks/input/config/spaces.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/config/spaces.bro rename to testing/btest/scripts/base/frameworks/input/config/spaces.zeek diff --git a/testing/btest/scripts/base/frameworks/input/default.bro b/testing/btest/scripts/base/frameworks/input/default.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/default.bro rename to testing/btest/scripts/base/frameworks/input/default.zeek diff --git a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro rename to testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek diff --git a/testing/btest/scripts/base/frameworks/input/emptyvals.bro b/testing/btest/scripts/base/frameworks/input/emptyvals.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/emptyvals.bro rename to testing/btest/scripts/base/frameworks/input/emptyvals.zeek diff --git a/testing/btest/scripts/base/frameworks/input/errors.bro b/testing/btest/scripts/base/frameworks/input/errors.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/errors.bro rename to testing/btest/scripts/base/frameworks/input/errors.zeek diff --git a/testing/btest/scripts/base/frameworks/input/event.bro b/testing/btest/scripts/base/frameworks/input/event.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/event.bro rename to testing/btest/scripts/base/frameworks/input/event.zeek diff --git a/testing/btest/scripts/base/frameworks/input/invalid-lines.bro b/testing/btest/scripts/base/frameworks/input/invalid-lines.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/invalid-lines.bro rename to testing/btest/scripts/base/frameworks/input/invalid-lines.zeek diff --git a/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro b/testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/invalidnumbers.bro rename to testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek diff --git a/testing/btest/scripts/base/frameworks/input/invalidset.bro b/testing/btest/scripts/base/frameworks/input/invalidset.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/invalidset.bro rename to testing/btest/scripts/base/frameworks/input/invalidset.zeek diff --git a/testing/btest/scripts/base/frameworks/input/invalidtext.bro b/testing/btest/scripts/base/frameworks/input/invalidtext.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/invalidtext.bro rename to testing/btest/scripts/base/frameworks/input/invalidtext.zeek diff --git a/testing/btest/scripts/base/frameworks/input/missing-enum.bro b/testing/btest/scripts/base/frameworks/input/missing-enum.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/missing-enum.bro rename to testing/btest/scripts/base/frameworks/input/missing-enum.zeek diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/missing-file-initially.bro rename to testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek diff --git a/testing/btest/scripts/base/frameworks/input/missing-file.bro b/testing/btest/scripts/base/frameworks/input/missing-file.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/missing-file.bro rename to testing/btest/scripts/base/frameworks/input/missing-file.zeek diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro rename to testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/onecolumn-record.bro rename to testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek diff --git a/testing/btest/scripts/base/frameworks/input/optional.bro b/testing/btest/scripts/base/frameworks/input/optional.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/optional.bro rename to testing/btest/scripts/base/frameworks/input/optional.zeek diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek similarity index 92% rename from testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek index df8a68613d..68805679a9 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.bro +++ b/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() diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek similarity index 91% rename from testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek index 06d711a5e8..238150ffef 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.bro +++ b/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() diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek similarity index 89% rename from testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek index dd38fd7796..ed1cccbda8 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.bro +++ b/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() { diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-analysis.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-analysis.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-analysis.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-analysis.zeek diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-event.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-event.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-event.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-event.zeek diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-table.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-table.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-table.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/path-prefix-common-table.zeek diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.bro b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek similarity index 91% rename from testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.bro rename to testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek index 52ae233289..8706ade3f5 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.bro +++ b/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() diff --git a/testing/btest/scripts/base/frameworks/input/port-embedded.bro b/testing/btest/scripts/base/frameworks/input/port-embedded.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/port-embedded.bro rename to testing/btest/scripts/base/frameworks/input/port-embedded.zeek diff --git a/testing/btest/scripts/base/frameworks/input/port.bro b/testing/btest/scripts/base/frameworks/input/port.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/port.bro rename to testing/btest/scripts/base/frameworks/input/port.zeek diff --git a/testing/btest/scripts/base/frameworks/input/predicate-stream.bro b/testing/btest/scripts/base/frameworks/input/predicate-stream.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/predicate-stream.bro rename to testing/btest/scripts/base/frameworks/input/predicate-stream.zeek diff --git a/testing/btest/scripts/base/frameworks/input/predicate.bro b/testing/btest/scripts/base/frameworks/input/predicate.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/predicate.bro rename to testing/btest/scripts/base/frameworks/input/predicate.zeek diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodify.bro b/testing/btest/scripts/base/frameworks/input/predicatemodify.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/predicatemodify.bro rename to testing/btest/scripts/base/frameworks/input/predicatemodify.zeek diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro rename to testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek diff --git a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro rename to testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/basic.bro b/testing/btest/scripts/base/frameworks/input/raw/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/basic.bro rename to testing/btest/scripts/base/frameworks/input/raw/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/execute.bro b/testing/btest/scripts/base/frameworks/input/raw/execute.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/execute.bro rename to testing/btest/scripts/base/frameworks/input/raw/execute.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestdin.bro b/testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/executestdin.bro rename to testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream.bro b/testing/btest/scripts/base/frameworks/input/raw/executestream.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/executestream.bro rename to testing/btest/scripts/base/frameworks/input/raw/executestream.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/long.bro b/testing/btest/scripts/base/frameworks/input/raw/long.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/long.bro rename to testing/btest/scripts/base/frameworks/input/raw/long.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/offset.bro b/testing/btest/scripts/base/frameworks/input/raw/offset.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/offset.bro rename to testing/btest/scripts/base/frameworks/input/raw/offset.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro rename to testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/stderr.bro b/testing/btest/scripts/base/frameworks/input/raw/stderr.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/stderr.bro rename to testing/btest/scripts/base/frameworks/input/raw/stderr.zeek diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro b/testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/raw/streamraw.bro rename to testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek diff --git a/testing/btest/scripts/base/frameworks/input/repeat.bro b/testing/btest/scripts/base/frameworks/input/repeat.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/repeat.bro rename to testing/btest/scripts/base/frameworks/input/repeat.zeek diff --git a/testing/btest/scripts/base/frameworks/input/reread.bro b/testing/btest/scripts/base/frameworks/input/reread.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/reread.bro rename to testing/btest/scripts/base/frameworks/input/reread.zeek diff --git a/testing/btest/scripts/base/frameworks/input/set.bro b/testing/btest/scripts/base/frameworks/input/set.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/set.bro rename to testing/btest/scripts/base/frameworks/input/set.zeek diff --git a/testing/btest/scripts/base/frameworks/input/setseparator.bro b/testing/btest/scripts/base/frameworks/input/setseparator.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/setseparator.bro rename to testing/btest/scripts/base/frameworks/input/setseparator.zeek diff --git a/testing/btest/scripts/base/frameworks/input/setspecialcases.bro b/testing/btest/scripts/base/frameworks/input/setspecialcases.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/setspecialcases.bro rename to testing/btest/scripts/base/frameworks/input/setspecialcases.zeek diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro b/testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/sqlite/basic.bro rename to testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro b/testing/btest/scripts/base/frameworks/input/sqlite/error.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/sqlite/error.bro rename to testing/btest/scripts/base/frameworks/input/sqlite/error.zeek diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro b/testing/btest/scripts/base/frameworks/input/sqlite/port.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/sqlite/port.bro rename to testing/btest/scripts/base/frameworks/input/sqlite/port.zeek diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro b/testing/btest/scripts/base/frameworks/input/sqlite/types.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/sqlite/types.bro rename to testing/btest/scripts/base/frameworks/input/sqlite/types.zeek diff --git a/testing/btest/scripts/base/frameworks/input/stream.bro b/testing/btest/scripts/base/frameworks/input/stream.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/stream.bro rename to testing/btest/scripts/base/frameworks/input/stream.zeek diff --git a/testing/btest/scripts/base/frameworks/input/subrecord-event.bro b/testing/btest/scripts/base/frameworks/input/subrecord-event.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/subrecord-event.bro rename to testing/btest/scripts/base/frameworks/input/subrecord-event.zeek diff --git a/testing/btest/scripts/base/frameworks/input/subrecord.bro b/testing/btest/scripts/base/frameworks/input/subrecord.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/subrecord.bro rename to testing/btest/scripts/base/frameworks/input/subrecord.zeek diff --git a/testing/btest/scripts/base/frameworks/input/tableevent.bro b/testing/btest/scripts/base/frameworks/input/tableevent.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/tableevent.bro rename to testing/btest/scripts/base/frameworks/input/tableevent.zeek diff --git a/testing/btest/scripts/base/frameworks/input/twotables.bro b/testing/btest/scripts/base/frameworks/input/twotables.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/twotables.bro rename to testing/btest/scripts/base/frameworks/input/twotables.zeek diff --git a/testing/btest/scripts/base/frameworks/input/unsupported_types.bro b/testing/btest/scripts/base/frameworks/input/unsupported_types.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/unsupported_types.bro rename to testing/btest/scripts/base/frameworks/input/unsupported_types.zeek diff --git a/testing/btest/scripts/base/frameworks/input/windows.bro b/testing/btest/scripts/base/frameworks/input/windows.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/input/windows.bro rename to testing/btest/scripts/base/frameworks/input/windows.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.bro b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.bro rename to testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek index b81cac9bac..98fc45c29d 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.bro +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek @@ -13,7 +13,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: btest-diff manager-1/intel.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro rename to testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek index 5362886cd7..ecec5a0831 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: btest-diff manager-1/intel.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/intel/expire-item.bro b/testing/btest/scripts/base/frameworks/intel/expire-item.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/expire-item.bro rename to testing/btest/scripts/base/frameworks/intel/expire-item.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/filter-item.bro b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/filter-item.bro rename to testing/btest/scripts/base/frameworks/intel/filter-item.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/input-and-match.bro b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/input-and-match.bro rename to testing/btest/scripts/base/frameworks/intel/input-and-match.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/match-subnet.bro b/testing/btest/scripts/base/frameworks/intel/match-subnet.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/match-subnet.bro rename to testing/btest/scripts/base/frameworks/intel/match-subnet.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.bro b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek similarity index 96% rename from testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.bro rename to testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek index 14ce01d32e..e637ebb3c5 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.bro +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek @@ -16,7 +16,7 @@ 127.0.2.3 Intel::ADDR this btest @TEST-END-FILE -@load path-prefix-common.bro +@load path-prefix-common.zeek redef Intel::read_files += { "test.data" }; redef InputAscii::path_prefix = "/this/does/not/exist"; diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.bro b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.bro rename to testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek index 346f3bad81..1e7050aee9 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.bro +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek @@ -13,7 +13,7 @@ 127.0.1.3 Intel::ADDR this btest @TEST-END-FILE -@load path-prefix-common.bro +@load path-prefix-common.zeek redef Intel::read_files += { "test.data" }; redef InputAscii::path_prefix = "input"; diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.bro b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.bro rename to testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek index 19828ea8af..2e602752f1 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.bro +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek @@ -14,7 +14,7 @@ 127.0.0.3 Intel::ADDR this btest @TEST-END-FILE -@load path-prefix-common.bro +@load path-prefix-common.zeek redef Intel::read_files += { "test.data" }; redef InputAscii::path_prefix = "alternative"; diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.bro b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek similarity index 94% rename from testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.bro rename to testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek index 7148c1e857..7d02a0ac6a 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.bro +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek @@ -11,6 +11,6 @@ 127.0.0.3 Intel::ADDR this btest @TEST-END-FILE -@load path-prefix-common.bro +@load path-prefix-common.zeek redef Intel::read_files += { "test.data" }; diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/path-prefix-common.bro b/testing/btest/scripts/base/frameworks/intel/path-prefix/path-prefix-common.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/path-prefix/path-prefix-common.bro rename to testing/btest/scripts/base/frameworks/intel/path-prefix/path-prefix-common.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro rename to testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek index a4becfb2b3..f262898966 100644 --- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro +++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek @@ -11,7 +11,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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], diff --git a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.bro b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/intel/remove-item-cluster.bro rename to testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek index 5241231e1f..16ec0df4a4 100644 --- a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.bro +++ b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff manager-1/intel.log -# @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"], diff --git a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro rename to testing/btest/scripts/base/frameworks/intel/remove-non-existing.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/updated-match.bro b/testing/btest/scripts/base/frameworks/intel/updated-match.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/intel/updated-match.bro rename to testing/btest/scripts/base/frameworks/intel/updated-match.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/adapt-filter.bro b/testing/btest/scripts/base/frameworks/logging/adapt-filter.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/adapt-filter.bro rename to testing/btest/scripts/base/frameworks/logging/adapt-filter.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-binary.bro b/testing/btest/scripts/base/frameworks/logging/ascii-binary.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-binary.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-binary.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-double.bro b/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/logging/ascii-double.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-double.zeek index b824d93676..86a9716312 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-double.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek @@ -1,6 +1,6 @@ # @TEST-DOC: Test that the ASCII writer logs values of type "double" correctly. # -# @TEST-EXEC: bro -b %INPUT test-json.bro +# @TEST-EXEC: bro -b %INPUT test-json.zeek # @TEST-EXEC: mv test.log json.log # @TEST-EXEC: bro -b %INPUT # @TEST-EXEC: btest-diff test.log @@ -78,7 +78,7 @@ event bro_init() logwrite(d); } -# @TEST-START-FILE test-json.bro +# @TEST-START-FILE test-json.zeek redef LogAscii::use_json = T; diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-empty.bro b/testing/btest/scripts/base/frameworks/logging/ascii-empty.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-empty.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-empty.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-odd-url.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-odd-url.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape-odd-url.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape-odd-url.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-escape.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-escape.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro b/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-gz.bro b/testing/btest/scripts/base/frameworks/logging/ascii-gz.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-gz.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-gz.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-json-optional.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-json.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-json.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro b/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-options.bro b/testing/btest/scripts/base/frameworks/logging/ascii-options.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-options.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-options.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro b/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-timestamps.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro b/testing/btest/scripts/base/frameworks/logging/ascii-tsv.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro rename to testing/btest/scripts/base/frameworks/logging/ascii-tsv.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/attr-extend.bro b/testing/btest/scripts/base/frameworks/logging/attr-extend.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/attr-extend.bro rename to testing/btest/scripts/base/frameworks/logging/attr-extend.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/attr.bro b/testing/btest/scripts/base/frameworks/logging/attr.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/attr.bro rename to testing/btest/scripts/base/frameworks/logging/attr.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/disable-stream.bro b/testing/btest/scripts/base/frameworks/logging/disable-stream.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/disable-stream.bro rename to testing/btest/scripts/base/frameworks/logging/disable-stream.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/empty-event.bro b/testing/btest/scripts/base/frameworks/logging/empty-event.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/empty-event.bro rename to testing/btest/scripts/base/frameworks/logging/empty-event.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/enable-stream.bro b/testing/btest/scripts/base/frameworks/logging/enable-stream.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/enable-stream.bro rename to testing/btest/scripts/base/frameworks/logging/enable-stream.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/events.bro b/testing/btest/scripts/base/frameworks/logging/events.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/events.bro rename to testing/btest/scripts/base/frameworks/logging/events.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/exclude.bro b/testing/btest/scripts/base/frameworks/logging/exclude.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/exclude.bro rename to testing/btest/scripts/base/frameworks/logging/exclude.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek similarity index 87% rename from testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek index dd30ad4c6f..a974a3e195 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek @@ -1,15 +1,15 @@ # @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_PORT2 # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=manager-1 bro %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" +# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 bro %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: grep qux manager-1/reporter.log | sed 's#line ..#line XX#g' > manager-reporter.log # @TEST-EXEC: grep qux manager-1/reporter-2.log | sed 's#line ..*#line XX#g' >> manager-reporter.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | $SCRIPTS/diff-remove-abspath | grep -v ^# | $SCRIPTS/diff-sort" btest-diff manager-reporter.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek similarity index 84% rename from testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek index d38b5b744b..4159d91c59 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_PORT2 # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=manager-1 bro %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" +# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 bro %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff manager-1/http.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-complex.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-complex.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-extension-complex.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-complex.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-invalid.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-invalid.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-extension-invalid.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-invalid.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-optional.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-optional.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-extension-optional.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-optional.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-table.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-table.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-extension-table.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension-table.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension.bro b/testing/btest/scripts/base/frameworks/logging/field-extension.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-extension.bro rename to testing/btest/scripts/base/frameworks/logging/field-extension.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-name-map.bro b/testing/btest/scripts/base/frameworks/logging/field-name-map.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-name-map.bro rename to testing/btest/scripts/base/frameworks/logging/field-name-map.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/field-name-map2.bro b/testing/btest/scripts/base/frameworks/logging/field-name-map2.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/field-name-map2.bro rename to testing/btest/scripts/base/frameworks/logging/field-name-map2.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/file.bro b/testing/btest/scripts/base/frameworks/logging/file.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/file.bro rename to testing/btest/scripts/base/frameworks/logging/file.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/include.bro b/testing/btest/scripts/base/frameworks/logging/include.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/include.bro rename to testing/btest/scripts/base/frameworks/logging/include.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/no-local.bro b/testing/btest/scripts/base/frameworks/logging/no-local.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/no-local.bro rename to testing/btest/scripts/base/frameworks/logging/no-local.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/none-debug.bro b/testing/btest/scripts/base/frameworks/logging/none-debug.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/none-debug.bro rename to testing/btest/scripts/base/frameworks/logging/none-debug.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro b/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro rename to testing/btest/scripts/base/frameworks/logging/path-func-column-demote.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/path-func.bro b/testing/btest/scripts/base/frameworks/logging/path-func.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/path-func.bro rename to testing/btest/scripts/base/frameworks/logging/path-func.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/pred.bro b/testing/btest/scripts/base/frameworks/logging/pred.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/pred.bro rename to testing/btest/scripts/base/frameworks/logging/pred.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/remove.bro b/testing/btest/scripts/base/frameworks/logging/remove.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/remove.bro rename to testing/btest/scripts/base/frameworks/logging/remove.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/rotate-custom.bro b/testing/btest/scripts/base/frameworks/logging/rotate-custom.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/rotate-custom.bro rename to testing/btest/scripts/base/frameworks/logging/rotate-custom.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/rotate.bro b/testing/btest/scripts/base/frameworks/logging/rotate.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/rotate.bro rename to testing/btest/scripts/base/frameworks/logging/rotate.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/scope_sep.bro b/testing/btest/scripts/base/frameworks/logging/scope_sep.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/scope_sep.bro rename to testing/btest/scripts/base/frameworks/logging/scope_sep.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/scope_sep_and_field_name_map.bro b/testing/btest/scripts/base/frameworks/logging/scope_sep_and_field_name_map.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/scope_sep_and_field_name_map.bro rename to testing/btest/scripts/base/frameworks/logging/scope_sep_and_field_name_map.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/sqlite/error.bro rename to testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/set.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/set.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/sqlite/set.bro rename to testing/btest/scripts/base/frameworks/logging/sqlite/set.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro rename to testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/sqlite/types.bro rename to testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro rename to testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/stdout.bro b/testing/btest/scripts/base/frameworks/logging/stdout.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/stdout.bro rename to testing/btest/scripts/base/frameworks/logging/stdout.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/test-logging.bro b/testing/btest/scripts/base/frameworks/logging/test-logging.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/test-logging.bro rename to testing/btest/scripts/base/frameworks/logging/test-logging.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/types.bro b/testing/btest/scripts/base/frameworks/logging/types.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/types.bro rename to testing/btest/scripts/base/frameworks/logging/types.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/unset-record.bro b/testing/btest/scripts/base/frameworks/logging/unset-record.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/unset-record.bro rename to testing/btest/scripts/base/frameworks/logging/unset-record.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/vec.bro b/testing/btest/scripts/base/frameworks/logging/vec.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/vec.bro rename to testing/btest/scripts/base/frameworks/logging/vec.zeek diff --git a/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro b/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro rename to testing/btest/scripts/base/frameworks/logging/writer-path-conflict.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro rename to testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek index 9e0db8531a..4aadb33417 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek @@ -1,12 +1,12 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek @load base/frameworks/netcontrol @@ -89,7 +89,7 @@ event NetControl::rule_removed(r: NetControl::Rule, p: NetControl::PluginState, @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld.bro b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/netcontrol/acld.bro rename to testing/btest/scripts/base/frameworks/netcontrol/acld.zeek index 243e5e9b7c..91591336c3 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff send/netcontrol.log # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek @load base/frameworks/netcontrol @@ -94,7 +94,7 @@ event NetControl::rule_error(r: NetControl::Rule, p: NetControl::PluginState, ms @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek similarity index 81% rename from testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro rename to testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek index 50c04433ad..ec619f5b6b 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek @@ -2,17 +2,17 @@ # @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_PORT3 # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=manager-1 bro %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" +# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 bro %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" # @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat worker-1/.pid) 10 || (btest-bg-wait -k 1 && false) -# @TEST-EXEC: btest-bg-run worker-2 "cp ../cluster-layout.bro . && CLUSTER_NODE=worker-2 bro --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" +# @TEST-EXEC: btest-bg-run worker-2 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-2 bro --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" # @TEST-EXEC: btest-bg-wait 20 # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic.bro b/testing/btest/scripts/base/frameworks/netcontrol/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/basic.bro rename to testing/btest/scripts/base/frameworks/netcontrol/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/broker.bro b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek similarity index 95% rename from testing/btest/scripts/base/frameworks/netcontrol/broker.bro rename to testing/btest/scripts/base/frameworks/netcontrol/broker.zeek index 4d232c3325..9933e635c6 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/broker.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek @@ -1,13 +1,13 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/smtp.trace --pseudo-realtime ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff send/netcontrol.log # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek @load base/frameworks/netcontrol @@ -78,7 +78,7 @@ event NetControl::rule_timeout(r: NetControl::Rule, i: NetControl::FlowInfo, p: @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker diff --git a/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release-forgotten.bro b/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release-forgotten.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/catch-and-release-forgotten.bro rename to testing/btest/scripts/base/frameworks/netcontrol/catch-and-release-forgotten.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro b/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro rename to testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/delete-internal-state.bro b/testing/btest/scripts/base/frameworks/netcontrol/delete-internal-state.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/delete-internal-state.bro rename to testing/btest/scripts/base/frameworks/netcontrol/delete-internal-state.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/duplicate.bro b/testing/btest/scripts/base/frameworks/netcontrol/duplicate.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/duplicate.bro rename to testing/btest/scripts/base/frameworks/netcontrol/duplicate.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/find-rules.bro b/testing/btest/scripts/base/frameworks/netcontrol/find-rules.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/find-rules.bro rename to testing/btest/scripts/base/frameworks/netcontrol/find-rules.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/hook.bro b/testing/btest/scripts/base/frameworks/netcontrol/hook.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/hook.bro rename to testing/btest/scripts/base/frameworks/netcontrol/hook.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/multiple.bro b/testing/btest/scripts/base/frameworks/netcontrol/multiple.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/multiple.bro rename to testing/btest/scripts/base/frameworks/netcontrol/multiple.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/openflow.bro b/testing/btest/scripts/base/frameworks/netcontrol/openflow.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/openflow.bro rename to testing/btest/scripts/base/frameworks/netcontrol/openflow.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.bro b/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/packetfilter.bro rename to testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/quarantine-openflow.bro b/testing/btest/scripts/base/frameworks/netcontrol/quarantine-openflow.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/quarantine-openflow.bro rename to testing/btest/scripts/base/frameworks/netcontrol/quarantine-openflow.zeek diff --git a/testing/btest/scripts/base/frameworks/netcontrol/timeout.bro b/testing/btest/scripts/base/frameworks/netcontrol/timeout.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/netcontrol/timeout.bro rename to testing/btest/scripts/base/frameworks/netcontrol/timeout.zeek diff --git a/testing/btest/scripts/base/frameworks/notice/cluster.bro b/testing/btest/scripts/base/frameworks/notice/cluster.zeek similarity index 97% rename from testing/btest/scripts/base/frameworks/notice/cluster.bro rename to testing/btest/scripts/base/frameworks/notice/cluster.zeek index 69d1ac8364..cda5fc857e 100644 --- a/testing/btest/scripts/base/frameworks/notice/cluster.bro +++ b/testing/btest/scripts/base/frameworks/notice/cluster.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff manager-1/notice.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/notice/mail-alarms.bro b/testing/btest/scripts/base/frameworks/notice/mail-alarms.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/notice/mail-alarms.bro rename to testing/btest/scripts/base/frameworks/notice/mail-alarms.zeek diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.bro b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/notice/suppression-cluster.bro rename to testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek index e9b31e1756..73cd65cfe9 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.bro +++ b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff manager-1/notice.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-disable.bro b/testing/btest/scripts/base/frameworks/notice/suppression-disable.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/notice/suppression-disable.bro rename to testing/btest/scripts/base/frameworks/notice/suppression-disable.zeek diff --git a/testing/btest/scripts/base/frameworks/notice/suppression.bro b/testing/btest/scripts/base/frameworks/notice/suppression.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/notice/suppression.bro rename to testing/btest/scripts/base/frameworks/notice/suppression.zeek diff --git a/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek similarity index 94% rename from testing/btest/scripts/base/frameworks/openflow/broker-basic.bro rename to testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek index 9d43089b93..c46c00d2f3 100644 --- a/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro +++ b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek @@ -1,12 +1,12 @@ # @TEST-PORT: BROKER_PORT -# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.bro >recv.out" -# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/smtp.trace --pseudo-realtime ../send.bro >send.out" +# @TEST-EXEC: btest-bg-run recv "bro -b ../recv.zeek >recv.out" +# @TEST-EXEC: btest-bg-run send "bro -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.bro +@TEST-START-FILE send.zeek @load base/protocols/conn @load base/frameworks/openflow @@ -67,7 +67,7 @@ event OpenFlow::flow_mod_failure(name: string, match: OpenFlow::ofp_match, flow_ @TEST-END-FILE -@TEST-START-FILE recv.bro +@TEST-START-FILE recv.zeek @load base/frameworks/openflow diff --git a/testing/btest/scripts/base/frameworks/openflow/log-basic.bro b/testing/btest/scripts/base/frameworks/openflow/log-basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/openflow/log-basic.bro rename to testing/btest/scripts/base/frameworks/openflow/log-basic.zeek diff --git a/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek similarity index 84% rename from testing/btest/scripts/base/frameworks/openflow/log-cluster.bro rename to testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek index 33f20f8ce5..08cfbb581d 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro +++ b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek @@ -1,12 +1,12 @@ # @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_PORT2 # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=manager-1 bro %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.bro . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/smtp.trace %INPUT" +# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 bro %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 bro --pseudo-realtime -C -r $TRACES/smtp.trace %INPUT" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff manager-1/openflow.log -@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"], diff --git a/testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro b/testing/btest/scripts/base/frameworks/openflow/ryu-basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro rename to testing/btest/scripts/base/frameworks/openflow/ryu-basic.zeek diff --git a/testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro b/testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro rename to testing/btest/scripts/base/frameworks/reporter/disable-stderr.zeek diff --git a/testing/btest/scripts/base/frameworks/reporter/stderr.bro b/testing/btest/scripts/base/frameworks/reporter/stderr.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/reporter/stderr.bro rename to testing/btest/scripts/base/frameworks/reporter/stderr.zeek diff --git a/testing/btest/scripts/base/frameworks/software/version-parsing.bro b/testing/btest/scripts/base/frameworks/software/version-parsing.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/software/version-parsing.bro rename to testing/btest/scripts/base/frameworks/software/version-parsing.zeek diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro rename to testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek index 8f4bd26ef1..d611d29907 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek @@ -9,7 +9,7 @@ # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic.bro b/testing/btest/scripts/base/frameworks/sumstats/basic.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/sumstats/basic.bro rename to testing/btest/scripts/base/frameworks/sumstats/basic.zeek diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro rename to testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek index 949fcb3644..5bda9e3705 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 20 # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro rename to testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek index da8f8fb80f..00dab1212b 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek @@ -7,7 +7,7 @@ # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro rename to testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek index bb429a52cb..2c5621743f 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek @@ -10,7 +10,7 @@ # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand.bro b/testing/btest/scripts/base/frameworks/sumstats/on-demand.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/sumstats/on-demand.bro rename to testing/btest/scripts/base/frameworks/sumstats/on-demand.zeek diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek similarity index 99% rename from testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro rename to testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek index 227313635a..088b3c9c14 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 15 # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample.bro b/testing/btest/scripts/base/frameworks/sumstats/sample.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/sumstats/sample.bro rename to testing/btest/scripts/base/frameworks/sumstats/sample.zeek diff --git a/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro b/testing/btest/scripts/base/frameworks/sumstats/thresholding.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/sumstats/thresholding.bro rename to testing/btest/scripts/base/frameworks/sumstats/thresholding.zeek diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek similarity index 98% rename from testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro rename to testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek index 8a3a9bcf1b..f26eca11cf 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek @@ -9,7 +9,7 @@ # @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"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"], diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk.bro b/testing/btest/scripts/base/frameworks/sumstats/topk.zeek similarity index 100% rename from testing/btest/scripts/base/frameworks/sumstats/topk.bro rename to testing/btest/scripts/base/frameworks/sumstats/topk.zeek diff --git a/testing/btest/scripts/base/misc/version.bro b/testing/btest/scripts/base/misc/version.zeek similarity index 100% rename from testing/btest/scripts/base/misc/version.bro rename to testing/btest/scripts/base/misc/version.zeek diff --git a/testing/btest/scripts/base/protocols/conn/new_connection_contents.bro b/testing/btest/scripts/base/protocols/conn/new_connection_contents.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/conn/new_connection_contents.bro rename to testing/btest/scripts/base/protocols/conn/new_connection_contents.zeek diff --git a/testing/btest/scripts/base/protocols/conn/threshold.bro b/testing/btest/scripts/base/protocols/conn/threshold.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/conn/threshold.bro rename to testing/btest/scripts/base/protocols/conn/threshold.zeek diff --git a/testing/btest/scripts/base/protocols/dce-rpc/context.bro b/testing/btest/scripts/base/protocols/dce-rpc/context.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dce-rpc/context.bro rename to testing/btest/scripts/base/protocols/dce-rpc/context.zeek diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.zeek index 533bfd8e0b..e551bbf7d6 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_del_measure.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_del_measure.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_del_measure.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.zeek similarity index 97% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.zeek index 3e8c4f56d4..489be56505 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_en_spon.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_en_spon.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_en_spon.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.zeek index e95637b67d..9155ea0174 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_del.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_del.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_del.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.zeek index 8da9f078a4..87140ec1fe 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_read.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_read.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_read.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.zeek index 60761360ed..8ca9e3107d 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_file_write.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_write.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_file_write.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.zeek similarity index 95% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.zeek index 867382148b..868ce39cc0 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_link_only.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -C -r $TRACES/dnp3/dnp3_link_only.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -C -r $TRACES/dnp3/dnp3_link_only.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_write.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_read.zeek similarity index 83% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_write.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_read.zeek index 8669d701b2..340e2b3132 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_write.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_read.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_write.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_read.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.zeek index d97d37d0ce..f88c262d54 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_rec_time.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_rec_time.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_rec_time.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.zeek similarity index 95% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.zeek index a8acf4755c..9119c33a97 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_select_operate.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_select_operate.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_select_operate.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.zeek index a5f1f895cc..07479c92a2 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_en_spon.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_en_spon.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_en_spon.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.zeek index 073e758df4..cf64179dfe 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_read.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_read.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_read.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.zeek similarity index 94% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.zeek index c8708b10cd..c6deb5eb69 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_select_operate.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_select_operate.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_select_operate.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.zeek similarity index 96% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.zeek index d832d937a7..f88e04f37a 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_udp_write.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_write.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_udp_write.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/dnp3_read.bro b/testing/btest/scripts/base/protocols/dnp3/dnp3_write.zeek similarity index 82% rename from testing/btest/scripts/base/protocols/dnp3/dnp3_read.bro rename to testing/btest/scripts/base/protocols/dnp3/dnp3_write.zeek index ffb0e03653..86b99a11c7 100644 --- a/testing/btest/scripts/base/protocols/dnp3/dnp3_read.bro +++ b/testing/btest/scripts/base/protocols/dnp3/dnp3_write.zeek @@ -1,5 +1,5 @@ # -# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_read.pcap %DIR/events.bro >output +# @TEST-EXEC: bro -r $TRACES/dnp3/dnp3_write.pcap %DIR/events.zeek >output # @TEST-EXEC: btest-diff output # @TEST-EXEC: cat output | awk '{print $1}' | sort | uniq | wc -l >covered # @TEST-EXEC: cat ${DIST}/src/analyzer/protocol/dnp3/events.bif | grep "^event dnp3_" | wc -l >total diff --git a/testing/btest/scripts/base/protocols/dnp3/events.bro b/testing/btest/scripts/base/protocols/dnp3/events.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dnp3/events.bro rename to testing/btest/scripts/base/protocols/dnp3/events.zeek diff --git a/testing/btest/scripts/base/protocols/dns/caa.bro b/testing/btest/scripts/base/protocols/dns/caa.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/caa.bro rename to testing/btest/scripts/base/protocols/dns/caa.zeek diff --git a/testing/btest/scripts/base/protocols/dns/dns-key.bro b/testing/btest/scripts/base/protocols/dns/dns-key.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/dns-key.bro rename to testing/btest/scripts/base/protocols/dns/dns-key.zeek diff --git a/testing/btest/scripts/base/protocols/dns/dnskey.bro b/testing/btest/scripts/base/protocols/dns/dnskey.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/dnskey.bro rename to testing/btest/scripts/base/protocols/dns/dnskey.zeek diff --git a/testing/btest/scripts/base/protocols/dns/ds.bro b/testing/btest/scripts/base/protocols/dns/ds.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/ds.bro rename to testing/btest/scripts/base/protocols/dns/ds.zeek diff --git a/testing/btest/scripts/base/protocols/dns/duplicate-reponses.bro b/testing/btest/scripts/base/protocols/dns/duplicate-reponses.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/duplicate-reponses.bro rename to testing/btest/scripts/base/protocols/dns/duplicate-reponses.zeek diff --git a/testing/btest/scripts/base/protocols/dns/flip.bro b/testing/btest/scripts/base/protocols/dns/flip.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/flip.bro rename to testing/btest/scripts/base/protocols/dns/flip.zeek diff --git a/testing/btest/scripts/base/protocols/dns/huge-ttl.bro b/testing/btest/scripts/base/protocols/dns/huge-ttl.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/huge-ttl.bro rename to testing/btest/scripts/base/protocols/dns/huge-ttl.zeek diff --git a/testing/btest/scripts/base/protocols/dns/multiple-txt-strings.bro b/testing/btest/scripts/base/protocols/dns/multiple-txt-strings.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/multiple-txt-strings.bro rename to testing/btest/scripts/base/protocols/dns/multiple-txt-strings.zeek diff --git a/testing/btest/scripts/base/protocols/dns/nsec.bro b/testing/btest/scripts/base/protocols/dns/nsec.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/nsec.bro rename to testing/btest/scripts/base/protocols/dns/nsec.zeek diff --git a/testing/btest/scripts/base/protocols/dns/nsec3.bro b/testing/btest/scripts/base/protocols/dns/nsec3.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/nsec3.bro rename to testing/btest/scripts/base/protocols/dns/nsec3.zeek diff --git a/testing/btest/scripts/base/protocols/dns/rrsig.bro b/testing/btest/scripts/base/protocols/dns/rrsig.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/rrsig.bro rename to testing/btest/scripts/base/protocols/dns/rrsig.zeek diff --git a/testing/btest/scripts/base/protocols/dns/tsig.bro b/testing/btest/scripts/base/protocols/dns/tsig.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/tsig.bro rename to testing/btest/scripts/base/protocols/dns/tsig.zeek diff --git a/testing/btest/scripts/base/protocols/dns/zero-responses.bro b/testing/btest/scripts/base/protocols/dns/zero-responses.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/dns/zero-responses.bro rename to testing/btest/scripts/base/protocols/dns/zero-responses.zeek diff --git a/testing/btest/scripts/base/protocols/ftp/cwd-navigation.bro b/testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ftp/cwd-navigation.bro rename to testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek diff --git a/testing/btest/scripts/base/protocols/ftp/ftp-get-file-size.bro b/testing/btest/scripts/base/protocols/ftp/ftp-get-file-size.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ftp/ftp-get-file-size.bro rename to testing/btest/scripts/base/protocols/ftp/ftp-get-file-size.zeek diff --git a/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.bro b/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ftp/ftp-ipv4.bro rename to testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek diff --git a/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.bro b/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ftp/ftp-ipv6.bro rename to testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek diff --git a/testing/btest/scripts/base/protocols/http/100-continue.bro b/testing/btest/scripts/base/protocols/http/100-continue.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/100-continue.bro rename to testing/btest/scripts/base/protocols/http/100-continue.zeek diff --git a/testing/btest/scripts/base/protocols/http/101-switching-protocols.bro b/testing/btest/scripts/base/protocols/http/101-switching-protocols.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/101-switching-protocols.bro rename to testing/btest/scripts/base/protocols/http/101-switching-protocols.zeek diff --git a/testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro b/testing/btest/scripts/base/protocols/http/content-range-gap-skip.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro rename to testing/btest/scripts/base/protocols/http/content-range-gap-skip.zeek diff --git a/testing/btest/scripts/base/protocols/http/content-range-gap.bro b/testing/btest/scripts/base/protocols/http/content-range-gap.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/content-range-gap.bro rename to testing/btest/scripts/base/protocols/http/content-range-gap.zeek diff --git a/testing/btest/scripts/base/protocols/http/content-range-less-than-len.bro b/testing/btest/scripts/base/protocols/http/content-range-less-than-len.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/content-range-less-than-len.bro rename to testing/btest/scripts/base/protocols/http/content-range-less-than-len.zeek diff --git a/testing/btest/scripts/base/protocols/http/entity-gap.bro b/testing/btest/scripts/base/protocols/http/entity-gap.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/entity-gap.bro rename to testing/btest/scripts/base/protocols/http/entity-gap.zeek diff --git a/testing/btest/scripts/base/protocols/http/entity-gap2.bro b/testing/btest/scripts/base/protocols/http/entity-gap2.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/entity-gap2.bro rename to testing/btest/scripts/base/protocols/http/entity-gap2.zeek diff --git a/testing/btest/scripts/base/protocols/http/fake-content-length.bro b/testing/btest/scripts/base/protocols/http/fake-content-length.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/fake-content-length.bro rename to testing/btest/scripts/base/protocols/http/fake-content-length.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-bad-request-with-version.bro b/testing/btest/scripts/base/protocols/http/http-bad-request-with-version.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-bad-request-with-version.bro rename to testing/btest/scripts/base/protocols/http/http-bad-request-with-version.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-connect-with-header.bro b/testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-connect-with-header.bro rename to testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-connect.bro b/testing/btest/scripts/base/protocols/http/http-connect.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-connect.bro rename to testing/btest/scripts/base/protocols/http/http-connect.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-filename.bro b/testing/btest/scripts/base/protocols/http/http-filename.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-filename.bro rename to testing/btest/scripts/base/protocols/http/http-filename.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-header-crlf.bro b/testing/btest/scripts/base/protocols/http/http-header-crlf.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-header-crlf.bro rename to testing/btest/scripts/base/protocols/http/http-header-crlf.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-methods.bro b/testing/btest/scripts/base/protocols/http/http-methods.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-methods.bro rename to testing/btest/scripts/base/protocols/http/http-methods.zeek diff --git a/testing/btest/scripts/base/protocols/http/http-pipelining.bro b/testing/btest/scripts/base/protocols/http/http-pipelining.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/http-pipelining.bro rename to testing/btest/scripts/base/protocols/http/http-pipelining.zeek diff --git a/testing/btest/scripts/base/protocols/http/missing-zlib-header.bro b/testing/btest/scripts/base/protocols/http/missing-zlib-header.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/missing-zlib-header.bro rename to testing/btest/scripts/base/protocols/http/missing-zlib-header.zeek diff --git a/testing/btest/scripts/base/protocols/http/multipart-extract.bro b/testing/btest/scripts/base/protocols/http/multipart-extract.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/multipart-extract.bro rename to testing/btest/scripts/base/protocols/http/multipart-extract.zeek diff --git a/testing/btest/scripts/base/protocols/http/multipart-file-limit.bro b/testing/btest/scripts/base/protocols/http/multipart-file-limit.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/multipart-file-limit.bro rename to testing/btest/scripts/base/protocols/http/multipart-file-limit.zeek diff --git a/testing/btest/scripts/base/protocols/http/no-uri.bro b/testing/btest/scripts/base/protocols/http/no-uri.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/no-uri.bro rename to testing/btest/scripts/base/protocols/http/no-uri.zeek diff --git a/testing/btest/scripts/base/protocols/http/no-version.bro b/testing/btest/scripts/base/protocols/http/no-version.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/no-version.bro rename to testing/btest/scripts/base/protocols/http/no-version.zeek diff --git a/testing/btest/scripts/base/protocols/http/percent-end-of-line.bro b/testing/btest/scripts/base/protocols/http/percent-end-of-line.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/percent-end-of-line.bro rename to testing/btest/scripts/base/protocols/http/percent-end-of-line.zeek diff --git a/testing/btest/scripts/base/protocols/http/x-gzip.bro b/testing/btest/scripts/base/protocols/http/x-gzip.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/x-gzip.bro rename to testing/btest/scripts/base/protocols/http/x-gzip.zeek diff --git a/testing/btest/scripts/base/protocols/http/zero-length-bodies-with-drops.bro b/testing/btest/scripts/base/protocols/http/zero-length-bodies-with-drops.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/http/zero-length-bodies-with-drops.bro rename to testing/btest/scripts/base/protocols/http/zero-length-bodies-with-drops.zeek diff --git a/testing/btest/scripts/base/protocols/irc/names-weird.bro b/testing/btest/scripts/base/protocols/irc/names-weird.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/irc/names-weird.bro rename to testing/btest/scripts/base/protocols/irc/names-weird.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/coil_parsing_big.bro b/testing/btest/scripts/base/protocols/modbus/coil_parsing_big.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/coil_parsing_big.bro rename to testing/btest/scripts/base/protocols/modbus/coil_parsing_big.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/coil_parsing_small.bro b/testing/btest/scripts/base/protocols/modbus/coil_parsing_small.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/coil_parsing_small.bro rename to testing/btest/scripts/base/protocols/modbus/coil_parsing_small.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/events.bro b/testing/btest/scripts/base/protocols/modbus/events.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/events.bro rename to testing/btest/scripts/base/protocols/modbus/events.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/length_mismatch.bro b/testing/btest/scripts/base/protocols/modbus/length_mismatch.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/length_mismatch.bro rename to testing/btest/scripts/base/protocols/modbus/length_mismatch.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/policy.bro b/testing/btest/scripts/base/protocols/modbus/policy.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/policy.bro rename to testing/btest/scripts/base/protocols/modbus/policy.zeek diff --git a/testing/btest/scripts/base/protocols/modbus/register_parsing.bro b/testing/btest/scripts/base/protocols/modbus/register_parsing.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/modbus/register_parsing.bro rename to testing/btest/scripts/base/protocols/modbus/register_parsing.zeek diff --git a/testing/btest/scripts/base/protocols/ncp/event.bro b/testing/btest/scripts/base/protocols/ncp/event.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ncp/event.bro rename to testing/btest/scripts/base/protocols/ncp/event.zeek diff --git a/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro b/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro rename to testing/btest/scripts/base/protocols/ncp/frame_size_tuning.zeek diff --git a/testing/btest/scripts/base/protocols/pop3/starttls.bro b/testing/btest/scripts/base/protocols/pop3/starttls.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/pop3/starttls.bro rename to testing/btest/scripts/base/protocols/pop3/starttls.zeek diff --git a/testing/btest/scripts/base/protocols/rdp/rdp-proprietary-encryption.bro b/testing/btest/scripts/base/protocols/rdp/rdp-proprietary-encryption.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/rdp/rdp-proprietary-encryption.bro rename to testing/btest/scripts/base/protocols/rdp/rdp-proprietary-encryption.zeek diff --git a/testing/btest/scripts/base/protocols/rdp/rdp-to-ssl.bro b/testing/btest/scripts/base/protocols/rdp/rdp-to-ssl.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/rdp/rdp-to-ssl.bro rename to testing/btest/scripts/base/protocols/rdp/rdp-to-ssl.zeek diff --git a/testing/btest/scripts/base/protocols/rdp/rdp-x509.bro b/testing/btest/scripts/base/protocols/rdp/rdp-x509.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/rdp/rdp-x509.bro rename to testing/btest/scripts/base/protocols/rdp/rdp-x509.zeek diff --git a/testing/btest/scripts/base/protocols/smb/smb2-read-write.bro b/testing/btest/scripts/base/protocols/smb/smb2-read-write.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/smb/smb2-read-write.bro rename to testing/btest/scripts/base/protocols/smb/smb2-read-write.zeek diff --git a/testing/btest/scripts/base/protocols/snmp/snmp-addr.bro b/testing/btest/scripts/base/protocols/snmp/snmp-addr.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/snmp/snmp-addr.bro rename to testing/btest/scripts/base/protocols/snmp/snmp-addr.zeek diff --git a/testing/btest/scripts/base/protocols/snmp/v1.bro b/testing/btest/scripts/base/protocols/snmp/v1.zeek similarity index 78% rename from testing/btest/scripts/base/protocols/snmp/v1.bro rename to testing/btest/scripts/base/protocols/snmp/v1.zeek index 7dd5bd4a68..09f86a28e4 100644 --- a/testing/btest/scripts/base/protocols/snmp/v1.bro +++ b/testing/btest/scripts/base/protocols/snmp/v1.zeek @@ -1,7 +1,7 @@ -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_get.pcap %INPUT $SCRIPTS/snmp-test.bro >out1 -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_get_short.pcap %INPUT $SCRIPTS/snmp-test.bro >out2 -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_set.pcap %INPUT $SCRIPTS/snmp-test.bro >out3 -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_trap.pcap %INPUT $SCRIPTS/snmp-test.bro >out4 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_get.pcap %INPUT $SCRIPTS/snmp-test.zeek >out1 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_get_short.pcap %INPUT $SCRIPTS/snmp-test.zeek >out2 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_set.pcap %INPUT $SCRIPTS/snmp-test.zeek >out3 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv1_trap.pcap %INPUT $SCRIPTS/snmp-test.zeek >out4 # @TEST-EXEC: btest-diff out1 # @TEST-EXEC: btest-diff out2 diff --git a/testing/btest/scripts/base/protocols/snmp/v2.bro b/testing/btest/scripts/base/protocols/snmp/v2.zeek similarity index 77% rename from testing/btest/scripts/base/protocols/snmp/v2.bro rename to testing/btest/scripts/base/protocols/snmp/v2.zeek index a2b9885fbb..58491d33b2 100644 --- a/testing/btest/scripts/base/protocols/snmp/v2.bro +++ b/testing/btest/scripts/base/protocols/snmp/v2.zeek @@ -1,6 +1,6 @@ -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get.pcap %INPUT $SCRIPTS/snmp-test.bro >out1 -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get_bulk.pcap %INPUT $SCRIPTS/snmp-test.bro >out2 -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get_next.pcap %INPUT $SCRIPTS/snmp-test.bro >out3 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get.pcap %INPUT $SCRIPTS/snmp-test.zeek >out1 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get_bulk.pcap %INPUT $SCRIPTS/snmp-test.zeek >out2 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv2_get_next.pcap %INPUT $SCRIPTS/snmp-test.zeek >out3 # @TEST-EXEC: btest-diff out1 # @TEST-EXEC: btest-diff out2 diff --git a/testing/btest/scripts/base/protocols/snmp/v3.bro b/testing/btest/scripts/base/protocols/snmp/v3.zeek similarity index 79% rename from testing/btest/scripts/base/protocols/snmp/v3.bro rename to testing/btest/scripts/base/protocols/snmp/v3.zeek index 43edbdc2df..4d72b6476d 100644 --- a/testing/btest/scripts/base/protocols/snmp/v3.bro +++ b/testing/btest/scripts/base/protocols/snmp/v3.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv3_get_next.pcap %INPUT $SCRIPTS/snmp-test.bro >out1 +# @TEST-EXEC: bro -b -r $TRACES/snmp/snmpv3_get_next.pcap %INPUT $SCRIPTS/snmp-test.zeek >out1 # @TEST-EXEC: btest-diff out1 diff --git a/testing/btest/scripts/base/protocols/socks/socks-auth.bro b/testing/btest/scripts/base/protocols/socks/socks-auth.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/socks/socks-auth.bro rename to testing/btest/scripts/base/protocols/socks/socks-auth.zeek diff --git a/testing/btest/scripts/base/protocols/syslog/missing-pri.bro b/testing/btest/scripts/base/protocols/syslog/missing-pri.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/syslog/missing-pri.bro rename to testing/btest/scripts/base/protocols/syslog/missing-pri.zeek diff --git a/testing/btest/scripts/base/protocols/tcp/pending.bro b/testing/btest/scripts/base/protocols/tcp/pending.zeek similarity index 100% rename from testing/btest/scripts/base/protocols/tcp/pending.bro rename to testing/btest/scripts/base/protocols/tcp/pending.zeek diff --git a/testing/btest/scripts/base/utils/decompose_uri.bro b/testing/btest/scripts/base/utils/decompose_uri.zeek similarity index 100% rename from testing/btest/scripts/base/utils/decompose_uri.bro rename to testing/btest/scripts/base/utils/decompose_uri.zeek diff --git a/testing/btest/scripts/base/utils/dir.test b/testing/btest/scripts/base/utils/dir.test index 4cbb4a3c89..d7071e1d4c 100644 --- a/testing/btest/scripts/base/utils/dir.test +++ b/testing/btest/scripts/base/utils/dir.test @@ -1,4 +1,4 @@ -# @TEST-EXEC: btest-bg-run bro bro -b ../dirtest.bro +# @TEST-EXEC: btest-bg-run bro bro -b ../dirtest.zeek # @TEST-EXEC: $SCRIPTS/wait-for-file bro/next1 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: touch testdir/newone # @TEST-EXEC: rm testdir/bye @@ -8,7 +8,7 @@ # @TEST-EXEC: touch testdir/newone # @TEST-EXEC: btest-diff bro/.stdout -@TEST-START-FILE dirtest.bro +@TEST-START-FILE dirtest.zeek @load base/utils/dir redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/utils/exec.test b/testing/btest/scripts/base/utils/exec.test index 0b926df402..d761587f31 100644 --- a/testing/btest/scripts/base/utils/exec.test +++ b/testing/btest/scripts/base/utils/exec.test @@ -1,8 +1,8 @@ -# @TEST-EXEC: btest-bg-run bro bro -b ../exectest.bro +# @TEST-EXEC: btest-bg-run bro bro -b ../exectest.zeek # @TEST-EXEC: btest-bg-wait 15 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff bro/.stdout -@TEST-START-FILE exectest.bro +@TEST-START-FILE exectest.zeek @load base/utils/exec redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/utils/hash_hrw.bro b/testing/btest/scripts/base/utils/hash_hrw.zeek similarity index 100% rename from testing/btest/scripts/base/utils/hash_hrw.bro rename to testing/btest/scripts/base/utils/hash_hrw.zeek diff --git a/testing/btest/scripts/check-test-all-policy.bro b/testing/btest/scripts/check-test-all-policy.zeek similarity index 100% rename from testing/btest/scripts/check-test-all-policy.bro rename to testing/btest/scripts/check-test-all-policy.zeek diff --git a/testing/btest/scripts/policy/frameworks/files/extract-all.bro b/testing/btest/scripts/policy/frameworks/files/extract-all.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/files/extract-all.bro rename to testing/btest/scripts/policy/frameworks/files/extract-all.zeek diff --git a/testing/btest/scripts/policy/frameworks/intel/removal.bro b/testing/btest/scripts/policy/frameworks/intel/removal.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/intel/removal.bro rename to testing/btest/scripts/policy/frameworks/intel/removal.zeek diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/certs.bro b/testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/intel/seen/certs.bro rename to testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smb.bro b/testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/intel/seen/smb.bro rename to testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro b/testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro rename to testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek diff --git a/testing/btest/scripts/policy/frameworks/intel/whitelisting.bro b/testing/btest/scripts/policy/frameworks/intel/whitelisting.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/intel/whitelisting.bro rename to testing/btest/scripts/policy/frameworks/intel/whitelisting.zeek diff --git a/testing/btest/scripts/policy/frameworks/software/version-changes.bro b/testing/btest/scripts/policy/frameworks/software/version-changes.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/software/version-changes.bro rename to testing/btest/scripts/policy/frameworks/software/version-changes.zeek diff --git a/testing/btest/scripts/policy/frameworks/software/vulnerable.bro b/testing/btest/scripts/policy/frameworks/software/vulnerable.zeek similarity index 100% rename from testing/btest/scripts/policy/frameworks/software/vulnerable.bro rename to testing/btest/scripts/policy/frameworks/software/vulnerable.zeek diff --git a/testing/btest/scripts/policy/misc/dump-events.bro b/testing/btest/scripts/policy/misc/dump-events.zeek similarity index 100% rename from testing/btest/scripts/policy/misc/dump-events.bro rename to testing/btest/scripts/policy/misc/dump-events.zeek diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.bro b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek similarity index 98% rename from testing/btest/scripts/policy/misc/weird-stats-cluster.bro rename to testing/btest/scripts/policy/misc/weird-stats-cluster.zeek index 140bb3b006..0c73ccf189 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.bro +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek @@ -9,7 +9,7 @@ # @TEST-EXEC: btest-diff manager-1/weird_stats.log -@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"], diff --git a/testing/btest/scripts/policy/misc/weird-stats.bro b/testing/btest/scripts/policy/misc/weird-stats.zeek similarity index 100% rename from testing/btest/scripts/policy/misc/weird-stats.bro rename to testing/btest/scripts/policy/misc/weird-stats.zeek diff --git a/testing/btest/scripts/policy/protocols/conn/known-hosts.bro b/testing/btest/scripts/policy/protocols/conn/known-hosts.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/conn/known-hosts.bro rename to testing/btest/scripts/policy/protocols/conn/known-hosts.zeek diff --git a/testing/btest/scripts/policy/protocols/conn/known-services.bro b/testing/btest/scripts/policy/protocols/conn/known-services.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/conn/known-services.bro rename to testing/btest/scripts/policy/protocols/conn/known-services.zeek diff --git a/testing/btest/scripts/policy/protocols/conn/mac-logging.bro b/testing/btest/scripts/policy/protocols/conn/mac-logging.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/conn/mac-logging.bro rename to testing/btest/scripts/policy/protocols/conn/mac-logging.zeek diff --git a/testing/btest/scripts/policy/protocols/conn/vlan-logging.bro b/testing/btest/scripts/policy/protocols/conn/vlan-logging.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/conn/vlan-logging.bro rename to testing/btest/scripts/policy/protocols/conn/vlan-logging.zeek diff --git a/testing/btest/scripts/policy/protocols/dns/inverse-request.bro b/testing/btest/scripts/policy/protocols/dns/inverse-request.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/dns/inverse-request.bro rename to testing/btest/scripts/policy/protocols/dns/inverse-request.zeek diff --git a/testing/btest/scripts/policy/protocols/http/flash-version.bro b/testing/btest/scripts/policy/protocols/http/flash-version.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/http/flash-version.bro rename to testing/btest/scripts/policy/protocols/http/flash-version.zeek diff --git a/testing/btest/scripts/policy/protocols/http/header-names.bro b/testing/btest/scripts/policy/protocols/http/header-names.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/http/header-names.bro rename to testing/btest/scripts/policy/protocols/http/header-names.zeek diff --git a/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro b/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro rename to testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.zeek diff --git a/testing/btest/scripts/policy/protocols/krb/ticket-logging.bro b/testing/btest/scripts/policy/protocols/krb/ticket-logging.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/krb/ticket-logging.bro rename to testing/btest/scripts/policy/protocols/krb/ticket-logging.zeek diff --git a/testing/btest/scripts/policy/protocols/ssh/detect-bruteforcing.bro b/testing/btest/scripts/policy/protocols/ssh/detect-bruteforcing.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssh/detect-bruteforcing.bro rename to testing/btest/scripts/policy/protocols/ssh/detect-bruteforcing.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/expiring-certs.bro b/testing/btest/scripts/policy/protocols/ssl/expiring-certs.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/expiring-certs.bro rename to testing/btest/scripts/policy/protocols/ssl/expiring-certs.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/extract-certs-pem.bro b/testing/btest/scripts/policy/protocols/ssl/extract-certs-pem.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/extract-certs-pem.bro rename to testing/btest/scripts/policy/protocols/ssl/extract-certs-pem.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/heartbleed.bro b/testing/btest/scripts/policy/protocols/ssl/heartbleed.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/heartbleed.bro rename to testing/btest/scripts/policy/protocols/ssl/heartbleed.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/known-certs.bro b/testing/btest/scripts/policy/protocols/ssl/known-certs.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/known-certs.bro rename to testing/btest/scripts/policy/protocols/ssl/known-certs.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/log-hostcerts-only.bro b/testing/btest/scripts/policy/protocols/ssl/log-hostcerts-only.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/log-hostcerts-only.bro rename to testing/btest/scripts/policy/protocols/ssl/log-hostcerts-only.zeek diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro b/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.zeek similarity index 88% rename from testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro rename to testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.zeek index 712e333037..ccca29fd7c 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.zeek @@ -1,4 +1,4 @@ -# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap $SCRIPTS/external-ca-list.bro %INPUT +# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap $SCRIPTS/external-ca-list.zeek %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl.log @load protocols/ssl/validate-certs diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro b/testing/btest/scripts/policy/protocols/ssl/validate-certs.zeek similarity index 84% rename from testing/btest/scripts/policy/protocols/ssl/validate-certs.bro rename to testing/btest/scripts/policy/protocols/ssl/validate-certs.zeek index 03803fe2fa..9686c1ab28 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-certs.zeek @@ -1,6 +1,6 @@ -# @TEST-EXEC: bro -r $TRACES/tls/tls-expired-cert.trace $SCRIPTS/external-ca-list.bro %INPUT +# @TEST-EXEC: bro -r $TRACES/tls/tls-expired-cert.trace $SCRIPTS/external-ca-list.zeek %INPUT # @TEST-EXEC: cat ssl.log > ssl-all.log -# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap $SCRIPTS/external-ca-list.bro %INPUT +# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap $SCRIPTS/external-ca-list.zeek %INPUT # @TEST-EXEC: cat ssl.log >> ssl-all.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl-all.log diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-ocsp.bro b/testing/btest/scripts/policy/protocols/ssl/validate-ocsp.zeek similarity index 62% rename from testing/btest/scripts/policy/protocols/ssl/validate-ocsp.bro rename to testing/btest/scripts/policy/protocols/ssl/validate-ocsp.zeek index 4e53a46b02..21d174be91 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-ocsp.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-ocsp.zeek @@ -1,9 +1,9 @@ -# @TEST-EXEC: bro $SCRIPTS/external-ca-list.bro -C -r $TRACES/tls/ocsp-stapling.trace %INPUT +# @TEST-EXEC: bro $SCRIPTS/external-ca-list.zeek -C -r $TRACES/tls/ocsp-stapling.trace %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl.log -# @TEST-EXEC: bro $SCRIPTS/external-ca-list.bro -C -r $TRACES/tls/ocsp-stapling-twimg.trace %INPUT +# @TEST-EXEC: bro $SCRIPTS/external-ca-list.zeek -C -r $TRACES/tls/ocsp-stapling-twimg.trace %INPUT # @TEST-EXEC: mv ssl.log ssl-twimg.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl-twimg.log -# @TEST-EXEC: bro $SCRIPTS/external-ca-list.bro -C -r $TRACES/tls/ocsp-stapling-digicert.trace %INPUT +# @TEST-EXEC: bro $SCRIPTS/external-ca-list.zeek -C -r $TRACES/tls/ocsp-stapling-digicert.trace %INPUT # @TEST-EXEC: mv ssl.log ssl-digicert.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl-digicert.log diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-sct.bro b/testing/btest/scripts/policy/protocols/ssl/validate-sct.zeek similarity index 88% rename from testing/btest/scripts/policy/protocols/ssl/validate-sct.bro rename to testing/btest/scripts/policy/protocols/ssl/validate-sct.zeek index 8dbd358e17..c21dc18094 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-sct.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-sct.zeek @@ -1,6 +1,6 @@ -# @TEST-EXEC: bro -r $TRACES/tls/signed_certificate_timestamp.pcap $SCRIPTS/external-ca-list.bro %INPUT +# @TEST-EXEC: bro -r $TRACES/tls/signed_certificate_timestamp.pcap $SCRIPTS/external-ca-list.zeek %INPUT # @TEST-EXEC: cat ssl.log > ssl-all.log -# @TEST-EXEC: bro -r $TRACES/tls/signed_certificate_timestamp-2.pcap $SCRIPTS/external-ca-list.bro %INPUT +# @TEST-EXEC: bro -r $TRACES/tls/signed_certificate_timestamp-2.pcap $SCRIPTS/external-ca-list.zeek %INPUT # @TEST-EXEC: cat ssl.log >> ssl-all.log # @TEST-EXEC: btest-diff .stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-x509-names | $SCRIPTS/diff-remove-timestamps" btest-diff ssl-all.log diff --git a/testing/btest/scripts/policy/protocols/ssl/weak-keys.bro b/testing/btest/scripts/policy/protocols/ssl/weak-keys.zeek similarity index 100% rename from testing/btest/scripts/policy/protocols/ssl/weak-keys.bro rename to testing/btest/scripts/policy/protocols/ssl/weak-keys.zeek diff --git a/testing/btest/signatures/bad-eval-condition.bro b/testing/btest/signatures/bad-eval-condition.zeek similarity index 100% rename from testing/btest/signatures/bad-eval-condition.bro rename to testing/btest/signatures/bad-eval-condition.zeek diff --git a/testing/btest/signatures/dpd.bro b/testing/btest/signatures/dpd.zeek similarity index 100% rename from testing/btest/signatures/dpd.bro rename to testing/btest/signatures/dpd.zeek diff --git a/testing/btest/signatures/dst-ip-cidr-v4.bro b/testing/btest/signatures/dst-ip-cidr-v4.zeek similarity index 100% rename from testing/btest/signatures/dst-ip-cidr-v4.bro rename to testing/btest/signatures/dst-ip-cidr-v4.zeek diff --git a/testing/btest/signatures/dst-ip-header-condition-v4-masks.bro b/testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek similarity index 100% rename from testing/btest/signatures/dst-ip-header-condition-v4-masks.bro rename to testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek diff --git a/testing/btest/signatures/dst-ip-header-condition-v4.bro b/testing/btest/signatures/dst-ip-header-condition-v4.zeek similarity index 100% rename from testing/btest/signatures/dst-ip-header-condition-v4.bro rename to testing/btest/signatures/dst-ip-header-condition-v4.zeek diff --git a/testing/btest/signatures/dst-ip-header-condition-v6-masks.bro b/testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek similarity index 100% rename from testing/btest/signatures/dst-ip-header-condition-v6-masks.bro rename to testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek diff --git a/testing/btest/signatures/dst-ip-header-condition-v6.bro b/testing/btest/signatures/dst-ip-header-condition-v6.zeek similarity index 100% rename from testing/btest/signatures/dst-ip-header-condition-v6.bro rename to testing/btest/signatures/dst-ip-header-condition-v6.zeek diff --git a/testing/btest/signatures/dst-port-header-condition.bro b/testing/btest/signatures/dst-port-header-condition.zeek similarity index 100% rename from testing/btest/signatures/dst-port-header-condition.bro rename to testing/btest/signatures/dst-port-header-condition.zeek diff --git a/testing/btest/signatures/eval-condition-no-return-value.bro b/testing/btest/signatures/eval-condition-no-return-value.zeek similarity index 100% rename from testing/btest/signatures/eval-condition-no-return-value.bro rename to testing/btest/signatures/eval-condition-no-return-value.zeek diff --git a/testing/btest/signatures/eval-condition.bro b/testing/btest/signatures/eval-condition.zeek similarity index 100% rename from testing/btest/signatures/eval-condition.bro rename to testing/btest/signatures/eval-condition.zeek diff --git a/testing/btest/signatures/header-header-condition.bro b/testing/btest/signatures/header-header-condition.zeek similarity index 100% rename from testing/btest/signatures/header-header-condition.bro rename to testing/btest/signatures/header-header-condition.zeek diff --git a/testing/btest/signatures/id-lookup.bro b/testing/btest/signatures/id-lookup.zeek similarity index 100% rename from testing/btest/signatures/id-lookup.bro rename to testing/btest/signatures/id-lookup.zeek diff --git a/testing/btest/signatures/ip-proto-header-condition.bro b/testing/btest/signatures/ip-proto-header-condition.zeek similarity index 100% rename from testing/btest/signatures/ip-proto-header-condition.bro rename to testing/btest/signatures/ip-proto-header-condition.zeek diff --git a/testing/btest/signatures/load-sigs.bro b/testing/btest/signatures/load-sigs.zeek similarity index 100% rename from testing/btest/signatures/load-sigs.bro rename to testing/btest/signatures/load-sigs.zeek diff --git a/testing/btest/signatures/src-ip-header-condition-v4-masks.bro b/testing/btest/signatures/src-ip-header-condition-v4-masks.zeek similarity index 100% rename from testing/btest/signatures/src-ip-header-condition-v4-masks.bro rename to testing/btest/signatures/src-ip-header-condition-v4-masks.zeek diff --git a/testing/btest/signatures/src-ip-header-condition-v4.bro b/testing/btest/signatures/src-ip-header-condition-v4.zeek similarity index 100% rename from testing/btest/signatures/src-ip-header-condition-v4.bro rename to testing/btest/signatures/src-ip-header-condition-v4.zeek diff --git a/testing/btest/signatures/src-ip-header-condition-v6-masks.bro b/testing/btest/signatures/src-ip-header-condition-v6-masks.zeek similarity index 100% rename from testing/btest/signatures/src-ip-header-condition-v6-masks.bro rename to testing/btest/signatures/src-ip-header-condition-v6-masks.zeek diff --git a/testing/btest/signatures/src-ip-header-condition-v6.bro b/testing/btest/signatures/src-ip-header-condition-v6.zeek similarity index 100% rename from testing/btest/signatures/src-ip-header-condition-v6.bro rename to testing/btest/signatures/src-ip-header-condition-v6.zeek diff --git a/testing/btest/signatures/src-port-header-condition.bro b/testing/btest/signatures/src-port-header-condition.zeek similarity index 100% rename from testing/btest/signatures/src-port-header-condition.bro rename to testing/btest/signatures/src-port-header-condition.zeek diff --git a/testing/btest/signatures/udp-packetwise-match.bro b/testing/btest/signatures/udp-packetwise-match.zeek similarity index 100% rename from testing/btest/signatures/udp-packetwise-match.bro rename to testing/btest/signatures/udp-packetwise-match.zeek diff --git a/testing/btest/signatures/udp-payload-size.bro b/testing/btest/signatures/udp-payload-size.zeek similarity index 100% rename from testing/btest/signatures/udp-payload-size.bro rename to testing/btest/signatures/udp-payload-size.zeek diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing index 029d39391b..758d688ec2 100644 --- a/testing/external/commit-hash.zeek-testing +++ b/testing/external/commit-hash.zeek-testing @@ -1 +1 @@ -37f541404be417d5b092b8b36c7c1c84d2f307e9 +96f9f7976b98447831fcfa2146007ea9ddb98f74 diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index a99b5e8d7b..04034e2be2 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -de8e378210cacc599d8e59e1204286f7fe9cbc1b +fb5be2e139ab5c9840eb6b50e691eacc66f62165 diff --git a/testing/external/scripts/external-ca-list.bro b/testing/external/scripts/external-ca-list.bro deleted file mode 120000 index a52a9be196..0000000000 --- a/testing/external/scripts/external-ca-list.bro +++ /dev/null @@ -1 +0,0 @@ -../../scripts/external-ca-list.bro \ No newline at end of file diff --git a/testing/external/scripts/external-ca-list.zeek b/testing/external/scripts/external-ca-list.zeek new file mode 120000 index 0000000000..a50808a16d --- /dev/null +++ b/testing/external/scripts/external-ca-list.zeek @@ -0,0 +1 @@ +../../scripts/external-ca-list.zeek \ No newline at end of file diff --git a/testing/external/scripts/testing-setup.bro b/testing/external/scripts/testing-setup.zeek similarity index 91% rename from testing/external/scripts/testing-setup.bro rename to testing/external/scripts/testing-setup.zeek index a56a72aee5..d24813e1fc 100644 --- a/testing/external/scripts/testing-setup.bro +++ b/testing/external/scripts/testing-setup.zeek @@ -1,6 +1,6 @@ # Sets some testing specific options. -@load external-ca-list.bro +@load external-ca-list @ifdef ( SMTP::never_calc_md5 ) # MDD5s can depend on libmagic output. diff --git a/testing/scripts/external-ca-list.bro b/testing/scripts/external-ca-list.zeek similarity index 100% rename from testing/scripts/external-ca-list.bro rename to testing/scripts/external-ca-list.zeek diff --git a/testing/scripts/file-analysis-test.bro b/testing/scripts/file-analysis-test.zeek similarity index 100% rename from testing/scripts/file-analysis-test.bro rename to testing/scripts/file-analysis-test.zeek diff --git a/testing/scripts/snmp-test.bro b/testing/scripts/snmp-test.zeek similarity index 100% rename from testing/scripts/snmp-test.bro rename to testing/scripts/snmp-test.zeek