From bd30baf42f38778884d0f74d6ff0943529c01924 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Fri, 16 Jun 2023 16:22:22 -0700 Subject: [PATCH] updates to ZAM-specific BTest baseline --- .../btest/Baseline.zam/bifs.from_json-11/.stderr | 4 ++-- .../btest/Baseline.zam/bifs.from_json-13/.stderr | 2 ++ .../btest/Baseline.zam/bifs.from_json-13/.stdout | 3 +++ .../btest/Baseline.zam/bifs.from_json-14/.stderr | 1 + .../btest/Baseline.zam/bifs.from_json-14/.stdout | 3 +++ .../btest/Baseline.zam/bifs.from_json-2/.stderr | 2 +- .../btest/Baseline.zam/bifs.from_json-3/.stderr | 2 +- .../btest/Baseline.zam/bifs.from_json-4/.stderr | 4 ++-- .../btest/Baseline.zam/bifs.from_json-5/.stderr | 2 +- .../btest/Baseline.zam/bifs.from_json-6/.stderr | 2 +- .../btest/Baseline.zam/bifs.from_json-7/.stderr | 4 ++-- .../btest/Baseline.zam/bifs.from_json-8/.stderr | 2 +- .../btest/Baseline.zam/bifs.from_json-9/.stderr | 2 +- .../broker.store.create-failure/zeek.err | 4 ++-- .../core.when-interpreter-exceptions/zeek.output | 15 +++++++++++++++ .../Baseline.zam/language.when-capture-errors/out | 8 ++++++++ 16 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 testing/btest/Baseline.zam/bifs.from_json-13/.stderr create mode 100644 testing/btest/Baseline.zam/bifs.from_json-13/.stdout create mode 100644 testing/btest/Baseline.zam/bifs.from_json-14/.stderr create mode 100644 testing/btest/Baseline.zam/bifs.from_json-14/.stdout create mode 100644 testing/btest/Baseline.zam/core.when-interpreter-exceptions/zeek.output create mode 100644 testing/btest/Baseline.zam/language.when-capture-errors/out diff --git a/testing/btest/Baseline.zam/bifs.from_json-11/.stderr b/testing/btest/Baseline.zam/bifs.from_json-11/.stderr index 83cccb763e..a94a645929 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-11/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-11/.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. -error in <...>/from_json.zeek, line 8: required field Foo$hello is missing in JSON (from_json({"t":null}, ::#0)) -error in <...>/from_json.zeek, line 9: required field Foo$hello is null in JSON (from_json({"hello": null, "t": true}, ::#2)) +error in <...>/from_json.zeek, line 8: required field Foo$hello is missing in JSON (from_json({"t":null}, ::#0, from_json_default_key_mapper)) +error in <...>/from_json.zeek, line 9: required field Foo$hello is null in JSON (from_json({"hello": null, "t": true}, ::#2, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-13/.stderr b/testing/btest/Baseline.zam/bifs.from_json-13/.stderr new file mode 100644 index 0000000000..ec05b0d535 --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.from_json-13/.stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +error in <...>/from_json.zeek, line 7: required field Foo$id_field is missing in JSON (from_json({"id-field": "Hello!"}, ::#0, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-13/.stdout b/testing/btest/Baseline.zam/bifs.from_json-13/.stdout new file mode 100644 index 0000000000..b75189ee1e --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.from_json-13/.stdout @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +[v=, valid=F] +[v=[id_field=Hello!], valid=T] diff --git a/testing/btest/Baseline.zam/bifs.from_json-14/.stderr b/testing/btest/Baseline.zam/bifs.from_json-14/.stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.from_json-14/.stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline.zam/bifs.from_json-14/.stdout b/testing/btest/Baseline.zam/bifs.from_json-14/.stdout new file mode 100644 index 0000000000..a7f883dc82 --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.from_json-14/.stdout @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +T +[ietf_mud_mud=[mud_version=1, mud_url=https://lighting.example.com/lightbulb2000, last_update=2019-01-28T11:20:51+01:00, cache_validity=48, is_supported=T, systeminfo=The BMS Example Light Bulb, from_device_policy=[access_lists=[access_list=[[name=mud-76100-v6fr]]]], to_device_policy=[access_lists=[access_list=[[name=mud-76100-v6to]]]]], ietf_access_control_list_acls=[acl=[[name=mud-76100-v6to, _type=ipv6-acl-type, aces=[ace=[[name=cl0-todev, matches=[ipv6=[ietf_acldns_dst_dnsname=, ietf_mud_direction_initiated=, destination_port=], tcp=[ietf_acldns_dst_dnsname=, ietf_mud_direction_initiated=from-device, destination_port=]]]]]], [name=mud-76100-v6fr, _type=ipv6-acl-type, aces=[ace=[[name=cl0-frdev, matches=[ipv6=[ietf_acldns_dst_dnsname=test.example.com, ietf_mud_direction_initiated=, destination_port=], tcp=[ietf_acldns_dst_dnsname=, ietf_mud_direction_initiated=from-device, destination_port=[operator=eq, _port=443]]]]]]]]]] diff --git a/testing/btest/Baseline.zam/bifs.from_json-2/.stderr b/testing/btest/Baseline.zam/bifs.from_json-2/.stderr index 5fe8977244..372f599e7f 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-2/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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 in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], 10)) +error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], 10, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-3/.stderr b/testing/btest/Baseline.zam/bifs.from_json-3/.stderr index e8e76fd280..233c4318e1 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-3/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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 in <...>/from_json.zeek, line 4: JSON parse error: Missing a closing quotation mark in string. Offset: 5 (from_json({"hel, ::#0)) +error in <...>/from_json.zeek, line 4: JSON parse error: Missing a closing quotation mark in string. Offset: 5 (from_json({"hel, ::#0, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-4/.stderr b/testing/btest/Baseline.zam/bifs.from_json-4/.stderr index ed567bc817..42e6dad6f0 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-4/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-4/.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. -error in <...>/from_json.zeek, line 9: cannot convert JSON type 'array' to Zeek type 'bool' (from_json([], ::#0)) -error in <...>/from_json.zeek, line 10: cannot convert JSON type 'string' to Zeek type 'bool' (from_json({"a": "hello"}, ::#2)) +error in <...>/from_json.zeek, line 9: cannot convert JSON type 'array' to Zeek type 'bool' (from_json([], ::#0, from_json_default_key_mapper)) +error in <...>/from_json.zeek, line 10: cannot convert JSON type 'string' to Zeek type 'bool' (from_json({"a": "hello"}, ::#2, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-5/.stderr b/testing/btest/Baseline.zam/bifs.from_json-5/.stderr index a8d80a29c7..ed0056356c 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-5/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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 in <...>/from_json.zeek, line 4: tables are not supported (from_json([], ::#0)) +error in <...>/from_json.zeek, line 4: tables are not supported (from_json([], ::#0, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-6/.stderr b/testing/btest/Baseline.zam/bifs.from_json-6/.stderr index 2ac321f4e0..7a7c048f3c 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-6/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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 in <...>/from_json.zeek, line 5: wrong port format, must be <...>/(tcp|udp|icmp|unknown)/ (from_json("80", ::#0)) +error in <...>/from_json.zeek, line 5: wrong port format, must be <...>/(tcp|udp|icmp|unknown)/ (from_json("80", ::#0, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-7/.stderr b/testing/btest/Baseline.zam/bifs.from_json-7/.stderr index fd5ec83642..315336902b 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-7/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-7/.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. -error in <...>/from_json.zeek, line 5: index type doesn't match (from_json([[1, false], [2]], ::#0)) -error in <...>/from_json.zeek, line 6: cannot convert JSON type 'number' to Zeek type 'bool' (from_json([[1, false], [2, 1]], ::#2)) +error in <...>/from_json.zeek, line 5: index type doesn't match (from_json([[1, false], [2]], ::#0, from_json_default_key_mapper)) +error in <...>/from_json.zeek, line 6: cannot convert JSON type 'number' to Zeek type 'bool' (from_json([[1, false], [2, 1]], ::#2, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-8/.stderr b/testing/btest/Baseline.zam/bifs.from_json-8/.stderr index ba565788a5..6c89085ca4 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-8/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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. error: error compiling pattern /^?(.|\n)*(([[:print:]]{-}[[:alnum:]]foo))/ -error in <...>/from_json.zeek, line 5: error compiling pattern (from_json("/([[:print:]]{-}[[:alnum:]]foo)/", ::#0)) +error in <...>/from_json.zeek, line 5: error compiling pattern (from_json("/([[:print:]]{-}[[:alnum:]]foo)/", ::#0, from_json_default_key_mapper)) diff --git a/testing/btest/Baseline.zam/bifs.from_json-9/.stderr b/testing/btest/Baseline.zam/bifs.from_json-9/.stderr index 14894c2146..7ff4fdd21e 100644 --- a/testing/btest/Baseline.zam/bifs.from_json-9/.stderr +++ b/testing/btest/Baseline.zam/bifs.from_json-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 in <...>/from_json.zeek, line 7: 'Yellow' is not a valid enum for 'Color'. (from_json("Yellow", ::#0)) +error in <...>/from_json.zeek, line 7: 'Yellow' is not a valid enum for 'Color'. (from_json("Yellow", ::#0, from_json_default_key_mapper)) 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 901a6bb7b2..05fd841e54 100644 --- a/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err +++ b/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err @@ -2,8 +2,8 @@ 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 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 <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.12) and broker::store::{}) +error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.21) 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.when-interpreter-exceptions/zeek.output b/testing/btest/Baseline.zam/core.when-interpreter-exceptions/zeek.output new file mode 100644 index 0000000000..d1fba762a4 --- /dev/null +++ b/testing/btest/Baseline.zam/core.when-interpreter-exceptions/zeek.output @@ -0,0 +1,15 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +### NOTE: This file has been sorted with diff-sort. +[f(F)] +[f(T)] +[zeek_init()] +f() done, no exception, T +g() done, no exception, T +received termination signal +runtime error in <...>/when-interpreter-exceptions.zeek, line 103: field value missing: $notset +runtime error in <...>/when-interpreter-exceptions.zeek, line 47: field value missing: $notset +runtime error in <...>/when-interpreter-exceptions.zeek, line 72: field value missing: $notset +runtime error in <...>/when-interpreter-exceptions.zeek, line 91: field value missing: $notset +timeout +timeout g(), F +timeout g(), T diff --git a/testing/btest/Baseline.zam/language.when-capture-errors/out b/testing/btest/Baseline.zam/language.when-capture-errors/out new file mode 100644 index 0000000000..35ae709e9b --- /dev/null +++ b/testing/btest/Baseline.zam/language.when-capture-errors/out @@ -0,0 +1,8 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +error in <...>/when-capture-errors.zeek, lines 19-22: orig1 is used inside "when" statement but not captured (when (0 < g) { print orig1}) +error in <...>/when-capture-errors.zeek, lines 25-28: orig3 is used inside "when" statement but not captured (when (0 < g || orig3) { print g}) +error in <...>/when-capture-errors.zeek, lines 34-38: orig1 is used inside "when" statement but not captured (when (0 < g) { print g} timeout 1.0 sec { print orig1}) +error in <...>/when-capture-errors.zeek, lines 66-70: orig2 is used inside "when" statement but not captured (when [orig1](0 < g) { print orig1} timeout 1.0 sec { print orig2}) +error in <...>/when-capture-errors.zeek, lines 76-80: orig3 is captured but not used inside "when" statement (when [orig1, orig2, orig3](0 < g) { print orig1} timeout 1.0 sec { print orig2}) +error in <...>/when-capture-errors.zeek, line 83: no such local identifier: l1 +error in <...>/when-capture-errors.zeek, line 89: no such local identifier: l2