From 2c9857a618a064485b818adb9ef5fb231e1e9977 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Thu, 9 Feb 2023 11:24:35 -0800 Subject: [PATCH] better error reporting when ZAM code calls a function --- auxil/gen-zam | 2 +- src/Frame.cc | 4 +++- src/Frame.h | 2 -- src/script_opt/ZAM/Expr.cc | 2 ++ src/script_opt/ZAM/ZInst.h | 4 ++++ testing/btest/Baseline.zam/bifs.cat_sep_errors-2/.stderr | 2 +- testing/btest/Baseline.zam/bifs.cat_sep_errors-3/.stderr | 2 +- testing/btest/Baseline.zam/bifs.cat_sep_errors-4/.stderr | 2 +- testing/btest/Baseline.zam/bifs.cat_sep_errors-5/.stderr | 2 +- testing/btest/Baseline.zam/bifs.cat_sep_errors/.stderr | 2 +- testing/btest/Baseline.zam/bifs.to_addr/error | 2 +- .../btest/Baseline.zam/bifs.to_double_from_string/error | 4 ++-- testing/btest/Baseline.zam/bifs.to_subnet/error | 6 +++--- .../Baseline.zam/broker.store.create-failure/zeek.err | 8 ++++---- .../btest/Baseline.zam/core.event-groups.errors-2/output | 3 --- .../btest/Baseline.zam/core.event-groups.errors-3/output | 3 --- .../btest/Baseline.zam/core.event-groups.errors-4/output | 3 --- .../btest/Baseline.zam/core.event-groups.errors/output | 3 --- .../Baseline.zam/core.option-runtime-errors-10/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-11/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-12/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-13/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-2/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-3/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-4/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-5/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-6/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-7/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-8/.stderr | 2 +- .../Baseline.zam/core.option-runtime-errors-9/.stderr | 2 +- .../btest/Baseline.zam/core.option-runtime-errors/.stderr | 2 +- .../language.any-script-func-variadic-errors/.stderr | 2 -- .../language.any-script-func-variadic-errors/output | 6 ------ 33 files changed, 38 insertions(+), 52 deletions(-) delete mode 100644 testing/btest/Baseline.zam/core.event-groups.errors-2/output delete mode 100644 testing/btest/Baseline.zam/core.event-groups.errors-3/output delete mode 100644 testing/btest/Baseline.zam/core.event-groups.errors-4/output delete mode 100644 testing/btest/Baseline.zam/core.event-groups.errors/output delete mode 100644 testing/btest/Baseline.zam/language.any-script-func-variadic-errors/.stderr delete mode 100644 testing/btest/Baseline.zam/language.any-script-func-variadic-errors/output diff --git a/auxil/gen-zam b/auxil/gen-zam index 1944debe32..3b636493c6 160000 --- a/auxil/gen-zam +++ b/auxil/gen-zam @@ -1 +1 @@ -Subproject commit 1944debe324787866e352f2e4f93acdfd3c6b821 +Subproject commit 3b636493c616e77bb8133036eddc911efd0be25a diff --git a/src/Frame.cc b/src/Frame.cc index dc1709c54b..44fb4697f7 100644 --- a/src/Frame.cc +++ b/src/Frame.cc @@ -206,7 +206,9 @@ std::pair Frame::Unserialize(const broker::vector& data, const detail::Location* Frame::GetCallLocation() const { - return call ? call->GetLocationInfo() : call_loc; + // This is currently trivial, but we keep it as an explicit + // method because it can provide flexibility for compiled code. + return call->GetLocationInfo(); } void Frame::SetTrigger(trigger::TriggerPtr arg_trigger) diff --git a/src/Frame.h b/src/Frame.h index 157a432f63..d403b2ddad 100644 --- a/src/Frame.h +++ b/src/Frame.h @@ -200,7 +200,6 @@ public: void SetTriggerAssoc(const void* arg_assoc) { assoc = arg_assoc; } const void* GetTriggerAssoc() const { return assoc; } - void SetCallLoc(const Location* loc) { call_loc = loc; } const detail::Location* GetCallLocation() const; void SetDelayed() { delayed = true; } @@ -254,7 +253,6 @@ private: trigger::TriggerPtr trigger; const CallExpr* call = nullptr; const void* assoc = nullptr; - const Location* call_loc = nullptr; // only needed if call is nil }; } // namespace detail diff --git a/src/script_opt/ZAM/Expr.cc b/src/script_opt/ZAM/Expr.cc index b1039ffcab..cbf29900fa 100644 --- a/src/script_opt/ZAM/Expr.cc +++ b/src/script_opt/ZAM/Expr.cc @@ -1025,6 +1025,8 @@ const ZAMStmt ZAMCompiler::DoCall(const CallExpr* c, const NameExpr* n) z.aux->can_change_globals = true; + z.call_expr = c; + if ( ! indirect || func_id->IsGlobal() ) { z.aux->id_val = func_id; diff --git a/src/script_opt/ZAM/ZInst.h b/src/script_opt/ZAM/ZInst.h index 20c40daba7..8102fbbb29 100644 --- a/src/script_opt/ZAM/ZInst.h +++ b/src/script_opt/ZAM/ZInst.h @@ -127,6 +127,10 @@ public: // Location associated with this instruction, for error reporting. const Location* loc = nullptr; + // Interpreter call expression associated with this instruction, + // for error reporting and stack backtraces. + const CallExpr* call_expr = nullptr; + // Whether v1 represents a frame slot type for which we // explicitly manage the memory. bool is_managed = false; diff --git a/testing/btest/Baseline.zam/bifs.cat_sep_errors-2/.stderr b/testing/btest/Baseline.zam/bifs.cat_sep_errors-2/.stderr index 901f35dbc7..13a40bc019 100644 --- a/testing/btest/Baseline.zam/bifs.cat_sep_errors-2/.stderr +++ b/testing/btest/Baseline.zam/bifs.cat_sep_errors-2/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: cat_sep() takes at least 2 arguments, got 1 +error in <...>/cat_sep_errors.zeek, line 3: cat_sep() takes at least 2 arguments, got 1 (cat_sep(sep)) diff --git a/testing/btest/Baseline.zam/bifs.cat_sep_errors-3/.stderr b/testing/btest/Baseline.zam/bifs.cat_sep_errors-3/.stderr index 30799e142e..c19b73c3da 100644 --- a/testing/btest/Baseline.zam/bifs.cat_sep_errors-3/.stderr +++ b/testing/btest/Baseline.zam/bifs.cat_sep_errors-3/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: expected type string for default, got count +error in <...>/cat_sep_errors.zeek, line 4: expected type string for default, got count (cat_sep(sep, 1)) diff --git a/testing/btest/Baseline.zam/bifs.cat_sep_errors-4/.stderr b/testing/btest/Baseline.zam/bifs.cat_sep_errors-4/.stderr index c1df9bf9c3..6416ec7c35 100644 --- a/testing/btest/Baseline.zam/bifs.cat_sep_errors-4/.stderr +++ b/testing/btest/Baseline.zam/bifs.cat_sep_errors-4/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: expected type string for separator, got count +error in <...>/cat_sep_errors.zeek, line 4: expected type string for separator, got count (cat_sep(1, default)) diff --git a/testing/btest/Baseline.zam/bifs.cat_sep_errors-5/.stderr b/testing/btest/Baseline.zam/bifs.cat_sep_errors-5/.stderr index 43e8239c1a..13009f26f2 100644 --- a/testing/btest/Baseline.zam/bifs.cat_sep_errors-5/.stderr +++ b/testing/btest/Baseline.zam/bifs.cat_sep_errors-5/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: expected type string for separator, got record +error in <...>/cat_sep_errors.zeek, line 3: expected type string for separator, got record (cat_sep(::#0, default)) diff --git a/testing/btest/Baseline.zam/bifs.cat_sep_errors/.stderr b/testing/btest/Baseline.zam/bifs.cat_sep_errors/.stderr index 89ba2477c6..f3813297fe 100644 --- a/testing/btest/Baseline.zam/bifs.cat_sep_errors/.stderr +++ b/testing/btest/Baseline.zam/bifs.cat_sep_errors/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: cat_sep() takes at least 2 arguments, got 0 +error in <...>/cat_sep_errors.zeek, line 6: cat_sep() takes at least 2 arguments, got 0 (cat_sep()) diff --git a/testing/btest/Baseline.zam/bifs.to_addr/error b/testing/btest/Baseline.zam/bifs.to_addr/error index 60ef944fd6..84d15c80cd 100644 --- a/testing/btest/Baseline.zam/bifs.to_addr/error +++ b/testing/btest/Baseline.zam/bifs.to_addr/error @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/to_addr.zeek, line 20: failed converting string to IP address (not an IP) +error in <...>/to_addr.zeek, line 7 and <...>/to_addr.zeek, line 20: failed converting string to IP address (to_addr(not an IP) and not an IP) diff --git a/testing/btest/Baseline.zam/bifs.to_double_from_string/error b/testing/btest/Baseline.zam/bifs.to_double_from_string/error index 55535e96f5..f357243401 100644 --- a/testing/btest/Baseline.zam/bifs.to_double_from_string/error +++ b/testing/btest/Baseline.zam/bifs.to_double_from_string/error @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/to_double_from_string.zeek, line 15: bad conversion to double (NotADouble) -error in <...>/to_double_from_string.zeek, line 16: bad conversion to double () +error in <...>/to_double_from_string.zeek, line 7 and <...>/to_double_from_string.zeek, line 15: bad conversion to double (to_double(NotADouble) and NotADouble) +error in <...>/to_double_from_string.zeek, line 7 and <...>/to_double_from_string.zeek, line 16: bad conversion to double (to_double() and ) diff --git a/testing/btest/Baseline.zam/bifs.to_subnet/error b/testing/btest/Baseline.zam/bifs.to_subnet/error index 072cb3d477..ca0fb7f10a 100644 --- a/testing/btest/Baseline.zam/bifs.to_subnet/error +++ b/testing/btest/Baseline.zam/bifs.to_subnet/error @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/to_subnet.zeek, line 10: failed converting string to IP prefix (10.0.0.0) -error in <...>/to_subnet.zeek, line 12: failed converting string to IP prefix (10.0.0.0/222) -error in <...>/to_subnet.zeek, line 14: failed converting string to IP prefix (don't work) +error in <...>/to_subnet.zeek, line 10: failed converting string to IP prefix (to_subnet(10.0.0.0) and 10.0.0.0) +error in <...>/to_subnet.zeek, line 12: failed converting string to IP prefix (to_subnet(10.0.0.0/222) and 10.0.0.0/222) +error in <...>/to_subnet.zeek, line 14: failed converting string to IP prefix (to_subnet(don't work) and don't work) diff --git a/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err b/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err index 761e4d5db5..901a6bb7b2 100644 --- a/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err +++ b/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Failed to attach master store backend_failure: -error: Could not create Broker master store '../fail' +error in <...>/store.zeek, line 780: Failed to attach master store backend_failure: (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.2)) +error in <...>/store.zeek, line 780: Could not create Broker master store '../fail' (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.2)) error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{}) -error in <...>/store.zeek, line 744: invalid Broker store handle (Broker::__close(Broker::h) and broker::store::{}) -error in <...>/store.zeek, line 744: invalid Broker store handle (Broker::__close(Broker::h) and broker::store::{}) +error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h) and broker::store::{}) +error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h) and broker::store::{}) error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{}) error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{}) error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{}) diff --git a/testing/btest/Baseline.zam/core.event-groups.errors-2/output b/testing/btest/Baseline.zam/core.event-groups.errors-2/output deleted file mode 100644 index 6ec085c36f..0000000000 --- a/testing/btest/Baseline.zam/core.event-groups.errors-2/output +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: no such event group: my-group -disable non existing event group, F diff --git a/testing/btest/Baseline.zam/core.event-groups.errors-3/output b/testing/btest/Baseline.zam/core.event-groups.errors-3/output deleted file mode 100644 index a2d6efb683..0000000000 --- a/testing/btest/Baseline.zam/core.event-groups.errors-3/output +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: no such event group: MyModule -enabling non existing module event group, F diff --git a/testing/btest/Baseline.zam/core.event-groups.errors-4/output b/testing/btest/Baseline.zam/core.event-groups.errors-4/output deleted file mode 100644 index a40f8b7759..0000000000 --- a/testing/btest/Baseline.zam/core.event-groups.errors-4/output +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: no such event group: MyModule -disable non existing module event group, F diff --git a/testing/btest/Baseline.zam/core.event-groups.errors/output b/testing/btest/Baseline.zam/core.event-groups.errors/output deleted file mode 100644 index 24354cae17..0000000000 --- a/testing/btest/Baseline.zam/core.event-groups.errors/output +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: no such event group: my-group -enable non existing event group, F diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-10/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-10/.stderr index 050c9c0ba5..116f3dcbfb 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-10/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-10/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: ID 'A' is not an option +error in <...>/option-runtime-errors.zeek, line 7: ID 'A' is not an option (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-11/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-11/.stderr index 62d5a8a090..2beaa49c15 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-11/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-11/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Option::on_change needs function argument; got 'count' for ID 'A' +error in <...>/option-runtime-errors.zeek, line 4: Option::on_change needs function argument; got 'count' for ID 'A' (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-12/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-12/.stderr index 857bdadc29..6be980cf68 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-12/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-12/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Third argument of passed function has to be string in Option::on_change for ID 'A'; got 'count' +error in <...>/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, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-13/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-13/.stderr index 4845997776..c244999790 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-13/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-13/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 4 +error in <...>/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, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr index 5b2673fc95..719b74fadc 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Incompatible type for set of ID 'A': got 'string', need 'count' +error in <...>/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.zam/core.option-runtime-errors-3/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr index 050c9c0ba5..f121199a5d 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: ID 'A' is not an option +error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, 6, )) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-4/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-4/.stderr index ee56477542..1582af091e 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-4/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-4/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Second argument of passed function has to be count in Option::on_change for ID 'A'; got 'bool' +error in <...>/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, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-5/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-5/.stderr index a9b83112dd..e124283ac9 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-5/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-5/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 1 +error in <...>/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, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-6/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-6/.stderr index 342fd0c712..c962daa683 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-6/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-6/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Passed function needs to return type 'count' for ID 'A'; got 'bool' +error in <...>/option-runtime-errors.zeek, line 7: Passed function needs to return type 'count' for ID 'A'; got 'bool' (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-7/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-7/.stderr index 3d205aa81f..14d6bdae29 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-7/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-7/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Option::on_change needs function argument; not hook or event +error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-8/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-8/.stderr index b3ee004d7a..e88b6c66a6 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-8/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-8/.stderr @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. warning in <...>/option-runtime-errors.zeek, line 4: handler for non-existing event cannot be invoked (option_changed) -error: Option::on_change needs function argument; not hook or event +error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-9/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-9/.stderr index 3798045b90..c98e3ca339 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors-9/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors-9/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Could not find ID named 'A' +error in <...>/option-runtime-errors.zeek, line 5: Could not find ID named 'A' (Option::set_change_handler(A, ::#0, 0)) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr index d6f103b886..7537f10f90 100644 --- a/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr +++ b/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error: Could not find ID named 'B' +error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, 6, )) diff --git a/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/.stderr b/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/.stderr deleted file mode 100644 index b00e21dc02..0000000000 --- a/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/.stderr +++ /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. -runtime error: too many arguments for function call diff --git a/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/output b/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/output deleted file mode 100644 index a6822601c7..0000000000 --- a/testing/btest/Baseline.zam/language.any-script-func-variadic-errors/output +++ /dev/null @@ -1,6 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -zeek_init() &priority=10 -l=a local x=1 -zeek_init() &priority=-10 -l=a local x=1 -l=a local x=1