diff --git a/testing/btest/Baseline.cpp/bifs.string_utils_errors/out b/testing/btest/Baseline.cpp/bifs.string_utils_errors/out index 05c24de432..1ddc527941 100644 --- a/testing/btest/Baseline.cpp/bifs.string_utils_errors/out +++ b/testing/btest/Baseline.cpp/bifs.string_utils_errors/out @@ -3,6 +3,12 @@ Justification (input string 'abc') ---------------------------------- ljust: 's' rjust: 's' + +find_str/rfind_str (input string 'abcdefghi') +----------------------------------------------------- find_str: -1 find_str: -1 +string_cat +----------------------------------------------------- +string_cat: diff --git a/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err b/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err index b539cd1ff9..daa59f5b73 100644 --- a/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err +++ b/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/main.zeek, lines 498-499: Failed to attach master store backend_failure: (Option::set_change_handler(Broker::metrics_export_prefixes, to_any_coerceBroker::update_metrics_export_prefixes, (coerce 0 to int))) -error in <...>/main.zeek, lines 498-499: Could not create Broker master store '../fail' (Option::set_change_handler(Broker::metrics_export_prefixes, to_any_coerceBroker::update_metrics_export_prefixes, (coerce 0 to int))) +error in <...>/main.zeek, lines 517-518: Failed to attach master store backend_failure: (Option::set_change_handler(Broker::metrics_export_prefixes, to_any_coerceBroker::update_metrics_export_prefixes, (coerce 0 to int))) +error in <...>/main.zeek, lines 517-518: Could not create Broker master store '../fail' (Option::set_change_handler(Broker::metrics_export_prefixes, to_any_coerceBroker::update_metrics_export_prefixes, (coerce 0 to int))) error in : invalid Broker store handle (broker::store::{}) error in : invalid Broker store handle (broker::store::{}) error in : invalid Broker store handle (broker::store::{}) diff --git a/testing/btest/Baseline.cpp/broker.store.invalid-handle/out b/testing/btest/Baseline.cpp/broker.store.invalid-handle/out index 73dff971be..d555720d2a 100644 --- a/testing/btest/Baseline.cpp/broker.store.invalid-handle/out +++ b/testing/btest/Baseline.cpp/broker.store.invalid-handle/out @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -runtime error in : invalid Broker store handle -error in <...>/invalid-handle.zeek, line 6: invalid Broker store handle (Broker::keys(a) and 0) -keys, [status=Broker::FAILURE, result=[data=]] +runtime error in compiled code: incompatible "any" type (int vs. opaque) +runtime error in compiled code: incompatible "any" type (int vs. opaque) + diff --git a/testing/btest/Baseline.cpp/core.div-by-zero/out b/testing/btest/Baseline.cpp/core.div-by-zero/out index 35db1ff00e..feef5a6e19 100644 --- a/testing/btest/Baseline.cpp/core.div-by-zero/out +++ b/testing/btest/Baseline.cpp/core.div-by-zero/out @@ -4,3 +4,5 @@ runtime error in compiled code: division by zero runtime error in compiled code: division by zero runtime error in compiled code: modulo by zero runtime error in compiled code: modulo by zero +runtime error in compiled code: division/modulo by zero +runtime error in compiled code: division/modulo by zero diff --git a/testing/btest/Baseline.cpp/core.reporter/logger-test.log b/testing/btest/Baseline.cpp/core.reporter/logger-test.log index 63a8abaf9d..e3f07da9c0 100644 --- a/testing/btest/Baseline.cpp/core.reporter/logger-test.log +++ b/testing/btest/Baseline.cpp/core.reporter/logger-test.log @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -reporter_info|init test-info|<...>/main.zeek, lines 498-499|XXXXXXXXXX.XXXXXX -reporter_warning|init test-warning|<...>/main.zeek, lines 498-499|XXXXXXXXXX.XXXXXX -reporter_error|init test-error|<...>/main.zeek, lines 498-499|XXXXXXXXXX.XXXXXX +reporter_info|init test-info|<...>/main.zeek, lines 517-518|XXXXXXXXXX.XXXXXX +reporter_warning|init test-warning|<...>/main.zeek, lines 517-518|XXXXXXXXXX.XXXXXX +reporter_error|init test-error|<...>/main.zeek, lines 517-518|XXXXXXXXXX.XXXXXX reporter_info|done test-info||XXXXXXXXXX.XXXXXX reporter_warning|done test-warning||XXXXXXXXXX.XXXXXX reporter_error|done test-error||XXXXXXXXXX.XXXXXX diff --git a/testing/btest/Baseline.cpp/core.reporter/output b/testing/btest/Baseline.cpp/core.reporter/output index 3e0dc0148f..c24704d176 100644 --- a/testing/btest/Baseline.cpp/core.reporter/output +++ b/testing/btest/Baseline.cpp/core.reporter/output @@ -2,9 +2,9 @@ pre test-info warning: pre test-warning error: pre test-error -<...>/main.zeek, lines 498-499: init test-info -warning in <...>/main.zeek, lines 498-499: init test-warning -error in <...>/main.zeek, lines 498-499: init test-error +<...>/main.zeek, lines 517-518: init test-info +warning in <...>/main.zeek, lines 517-518: init test-warning +error in <...>/main.zeek, lines 517-518: init test-error done test-info warning: done test-warning error: done test-error diff --git a/testing/btest/Baseline.cpp/language.enum-scope/output b/testing/btest/Baseline.cpp/language.enum-scope/output deleted file mode 100644 index 76cc851710..0000000000 --- a/testing/btest/Baseline.cpp/language.enum-scope/output +++ /dev/null @@ -1,2 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -test::a, test::b, test::a, test::b, diff --git a/testing/btest/Baseline.cpp/language.index-assignment-invalid/out b/testing/btest/Baseline.cpp/language.index-assignment-invalid/out index 60950763c1..ecb82e15f0 100644 --- a/testing/btest/Baseline.cpp/language.index-assignment-invalid/out +++ b/testing/btest/Baseline.cpp/language.index-assignment-invalid/out @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. runtime error in <...>/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,[3] = [a=T, b=hi, c=],[5] = 3,[0] = hello,[6] = jkl;,[4] = asdf,[1] = goodbye}, settings=[max_len=], top=7, bottom=0, size=0], [hello, goodbye, test]) at <...>/main.zeek:498 + #0 Queue::get_vector([initialized=T, vals={[2] = test,[3] = [a=T, b=hi, c=],[5] = 3,[0] = hello,[6] = jkl;,[4] = asdf,[1] = goodbye}, settings=[max_len=], top=7, bottom=0, size=0], [hello, goodbye, test]) at <...>/main.zeek:517 #1 zeek_init() diff --git a/testing/btest/Baseline.cpp/plugins.reporter-hook/output b/testing/btest/Baseline.cpp/plugins.reporter-hook/output index 90d7998a3e..194c546fcc 100644 --- a/testing/btest/Baseline.cpp/plugins.reporter-hook/output +++ b/testing/btest/Baseline.cpp/plugins.reporter-hook/output @@ -2,13 +2,13 @@ Reporter::Hook - Exercise Reporter Hook (dynamic, version 1.0.0) Implements Reporter (priority 0) - | Hook Some Info <...>/main.zeek, lines 498-499 - | Hook error An Error <...>/main.zeek, lines 498-499 - | Hook error An Error that does not show up in the log <...>/main.zeek, lines 498-499 + | Hook Some Info <...>/main.zeek, lines 517-518 + | Hook error An Error <...>/main.zeek, lines 517-518 + | Hook error An Error that does not show up in the log <...>/main.zeek, lines 517-518 | Hook runtime error in compiled code field value missing - | Hook warning A warning <...>/main.zeek, lines 498-499 -<...>/main.zeek, lines 498-499: Some Info -error in <...>/main.zeek, lines 498-499: An Error -error in <...>/main.zeek, lines 498-499: An Error that does not show up in the log + | Hook warning A warning <...>/main.zeek, lines 517-518 +<...>/main.zeek, lines 517-518: Some Info +error in <...>/main.zeek, lines 517-518: An Error +error in <...>/main.zeek, lines 517-518: An Error that does not show up in the log runtime error in compiled code: field value missing -warning in <...>/main.zeek, lines 498-499: A warning +warning in <...>/main.zeek, lines 517-518: A warning diff --git a/testing/btest/Baseline.cpp/plugins.reporter-hook/reporter.log b/testing/btest/Baseline.cpp/plugins.reporter-hook/reporter.log index d7d3df0419..03f3d8bf6c 100644 --- a/testing/btest/Baseline.cpp/plugins.reporter-hook/reporter.log +++ b/testing/btest/Baseline.cpp/plugins.reporter-hook/reporter.log @@ -7,8 +7,8 @@ #open XXXX-XX-XX-XX-XX-XX #fields ts level message location #types time enum string string -XXXXXXXXXX.XXXXXX Reporter::INFO Some Info <...>/main.zeek, lines 498-499 -XXXXXXXXXX.XXXXXX Reporter::WARNING A warning <...>/main.zeek, lines 498-499 -XXXXXXXXXX.XXXXXX Reporter::ERROR An Error <...>/main.zeek, lines 498-499 +XXXXXXXXXX.XXXXXX Reporter::INFO Some Info <...>/main.zeek, lines 517-518 +XXXXXXXXXX.XXXXXX Reporter::WARNING A warning <...>/main.zeek, lines 517-518 +XXXXXXXXXX.XXXXXX Reporter::ERROR An Error <...>/main.zeek, lines 517-518 XXXXXXXXXX.XXXXXX Reporter::ERROR field value missing (empty) #close XXXX-XX-XX-XX-XX-XX