From bf3cf9da489df6eb0a0b292169fa11555d9a83c7 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Tue, 6 Aug 2024 09:38:56 +0100 Subject: [PATCH] BTest updates for ZAM regularization changes --- .../Baseline.zam/bifs.from_json-2/.stderr | 2 +- .../core.option-runtime-errors-2/.stderr | 2 +- .../core.option-runtime-errors-3/.stderr | 2 +- .../core.option-runtime-errors/.stderr | 2 +- .../Baseline.zam/opt.validate-ZAM/output | 2 ++ testing/btest/Baseline/bifs.sub_bytes/.stderr | 1 + testing/btest/Baseline/bifs.sub_bytes/out | 9 ++++++++ .../language.vector-type-checking/out | 1 + testing/btest/bifs/sub_bytes.zeek | 22 +++++++++++++++++++ .../btest/language/vector-type-checking.zeek | 13 +++++++++++ testing/btest/opt/validate-ZAM.zeek | 5 +++++ 11 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 testing/btest/Baseline.zam/opt.validate-ZAM/output create mode 100644 testing/btest/Baseline/bifs.sub_bytes/.stderr create mode 100644 testing/btest/Baseline/bifs.sub_bytes/out create mode 100644 testing/btest/bifs/sub_bytes.zeek create mode 100644 testing/btest/opt/validate-ZAM.zeek diff --git a/testing/btest/Baseline.zam/bifs.from_json-2/.stderr b/testing/btest/Baseline.zam/bifs.from_json-2/.stderr index 372f599e7f..1a3fceee72 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, from_json_default_key_mapper)) +error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], ::#0, from_json_default_key_mapper)) 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 719b74fadc..15561eb6c9 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 in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, hi, )) +error in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, ::#0, )) 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 f121199a5d..682f1fbe27 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 in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, 6, )) +error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, ::#0, )) diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr index 7537f10f90..5e6d272614 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 in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, 6, )) +error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, ::#0, )) diff --git a/testing/btest/Baseline.zam/opt.validate-ZAM/output b/testing/btest/Baseline.zam/opt.validate-ZAM/output new file mode 100644 index 0000000000..b3ebf021ca --- /dev/null +++ b/testing/btest/Baseline.zam/opt.validate-ZAM/output @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +1237 valid, 1860 tested, 426 skipped diff --git a/testing/btest/Baseline/bifs.sub_bytes/.stderr b/testing/btest/Baseline/bifs.sub_bytes/.stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/bifs.sub_bytes/.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/bifs.sub_bytes/out b/testing/btest/Baseline/bifs.sub_bytes/out new file mode 100644 index 0000000000..6d1b207b13 --- /dev/null +++ b/testing/btest/Baseline/bifs.sub_bytes/out @@ -0,0 +1,9 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +bcde +bcde +bcde +bcde +bcde +bcde +bcde +bcde diff --git a/testing/btest/Baseline/language.vector-type-checking/out b/testing/btest/Baseline/language.vector-type-checking/out index 71eb85a096..f892af90fc 100644 --- a/testing/btest/Baseline/language.vector-type-checking/out +++ b/testing/btest/Baseline/language.vector-type-checking/out @@ -17,3 +17,4 @@ error in count and <...>/vector-type-checking.zeek, line 39: arithmetic mixed wi error in <...>/vector-type-checking.zeek, line 39 and count: type mismatch (thousand-two and count) error in <...>/vector-type-checking.zeek, line 39: inconsistent types in vector constructor (vector(thousand-two)) error in <...>/vector-type-checking.zeek, line 45: type clash in assignment (lea = vector(thousand-three)) +error in <...>/vector-type-checking.zeek, line 57: cannot compare string vectors with pattern vectors (vector(foo) == vector(<...>/)) diff --git a/testing/btest/bifs/sub_bytes.zeek b/testing/btest/bifs/sub_bytes.zeek new file mode 100644 index 0000000000..a1aa7217db --- /dev/null +++ b/testing/btest/bifs/sub_bytes.zeek @@ -0,0 +1,22 @@ +# @TEST-DOC: Test the sub_bytes() function. +# +# @TEST-EXEC: zeek -b %INPUT >out +# @TEST-EXEC: btest-diff out +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr + +# These tests are to ensure that script optimization gets all the permutations +# correct, for varying combinations of constant and variable arguments. + +global s = "abcdefghij"; +global a = 2; +global b = 4; + +print sub_bytes(s, a, b); +print sub_bytes(s, 2, b); +print sub_bytes(s, a, 4); +print sub_bytes(s, 2, 4); + +print sub_bytes("abcdefghij", a, b); +print sub_bytes("abcdefghij", 2, b); +print sub_bytes("abcdefghij", a, 4); +print sub_bytes("abcdefghij", 2, 4); diff --git a/testing/btest/language/vector-type-checking.zeek b/testing/btest/language/vector-type-checking.zeek index bdea76c4cd..24842efd44 100644 --- a/testing/btest/language/vector-type-checking.zeek +++ b/testing/btest/language/vector-type-checking.zeek @@ -44,3 +44,16 @@ event zeek_init() { local lea: MyVec = vector("thousand-three"); # type clash } + +# check operation that's okay as a scalar but not as a vector +event zeek_init() + { + if ( "foo" == /fo*/ ) + print "should not complain"; + } + +event zeek_init() + { + if ( vector("foo") == vector(/fo*/) ) + print "should complain"; + } diff --git a/testing/btest/opt/validate-ZAM.zeek b/testing/btest/opt/validate-ZAM.zeek new file mode 100644 index 0000000000..2640581f58 --- /dev/null +++ b/testing/btest/opt/validate-ZAM.zeek @@ -0,0 +1,5 @@ +# @TEST-DOC: ZAM maintenance script for validating synthesized operations. +# @TEST-REQUIRES: test "${ZEEK_ZAM}" == "1" +# +# @TEST-EXEC: zeek -b -O validate-ZAM %INPUT >output +# @TEST-EXEC: btest-diff output