From 6e84a1da5742b7af0568a5b8bcf1cfed6c5de30e Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Fri, 16 Sep 2022 10:06:57 -0700 Subject: [PATCH] updates to ZAM btest baselines --- .../bifs.disable_analyzer-hook/out | 16 ++++++++++++++++ .../coverage.coverage-blacklist/output | 18 +++++++++--------- .../language.unused-assignment/out | 2 +- .../language.vector-deprecated/.stderr | 6 +++--- .../.stdout | 11 +++++++++++ 5 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 testing/btest/Baseline.zam/bifs.disable_analyzer-hook/out create mode 100644 testing/btest/Baseline.zam/scripts.base.protocols.ssl.prevent-disable-analyzer/.stdout diff --git a/testing/btest/Baseline.zam/bifs.disable_analyzer-hook/out b/testing/btest/Baseline.zam/bifs.disable_analyzer-hook/out new file mode 100644 index 0000000000..c72bc161e8 --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.disable_analyzer-hook/out @@ -0,0 +1,16 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +proto confirm, AllAnalyzers::ANALYZER_ANALYZER_HTTP +http_request, GET, /style/enhanced.css +preventing disable_analyzer, [orig_h=192.168.1.104, orig_p=1673/tcp, resp_h=63.245.209.11, resp_p=80/tcp], AllAnalyzers::ANALYZER_ANALYZER_HTTP, 3, 1 +F +http_reply, 200 +http_request, GET, /script/urchin.js +preventing disable_analyzer, [orig_h=192.168.1.104, orig_p=1673/tcp, resp_h=63.245.209.11, resp_p=80/tcp], AllAnalyzers::ANALYZER_ANALYZER_HTTP, 3, 3 +F +http_reply, 200 +http_request, GET, /images/template/screen/bullet_utility.png +allowing disable_analyzer, [orig_h=192.168.1.104, orig_p=1673/tcp, resp_h=63.245.209.11, resp_p=80/tcp], AllAnalyzers::ANALYZER_ANALYZER_HTTP, 3, 5 +T +total http messages, { +[[orig_h=192.168.1.104, orig_p=1673/tcp, resp_h=63.245.209.11, resp_p=80/tcp]] = 5 +} diff --git a/testing/btest/Baseline.zam/coverage.coverage-blacklist/output b/testing/btest/Baseline.zam/coverage.coverage-blacklist/output index d54a7d5645..709d36b623 100644 --- a/testing/btest/Baseline.zam/coverage.coverage-blacklist/output +++ b/testing/btest/Baseline.zam/coverage.coverage-blacklist/output @@ -1,10 +1,10 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -0 <...>/coverage-blacklist.zeek, line 13 print cover me; -0 <...>/coverage-blacklist.zeek, line 15 if (T) print always executed; -0 <...>/coverage-blacklist.zeek, line 17 print always executed; -0 <...>/coverage-blacklist.zeek, line 22 if (F) print impossible; -0 <...>/coverage-blacklist.zeek, line 24 if (F) print also impossible, but included in code coverage analysis; -0 <...>/coverage-blacklist.zeek, line 26 print also impossible, but included in code coverage analysis; -0 <...>/coverage-blacklist.zeek, line 29 print success; -0 <...>/coverage-blacklist.zeek, line 5 print first; -0 <...>/coverage-blacklist.zeek, line 7 if (F) { print hello; print world; } +0 <...>/coverage-blacklist.zeek, line 10 if (F) { print hello; print world; } +0 <...>/coverage-blacklist.zeek, line 16 print cover me; +0 <...>/coverage-blacklist.zeek, line 18 if (T) print always executed; +0 <...>/coverage-blacklist.zeek, line 20 print always executed; +0 <...>/coverage-blacklist.zeek, line 25 if (F) print impossible; +0 <...>/coverage-blacklist.zeek, line 27 if (F) print also impossible, but included in code coverage analysis; +0 <...>/coverage-blacklist.zeek, line 29 print also impossible, but included in code coverage analysis; +0 <...>/coverage-blacklist.zeek, line 32 print success; +0 <...>/coverage-blacklist.zeek, line 8 print first; diff --git a/testing/btest/Baseline.zam/language.unused-assignment/out b/testing/btest/Baseline.zam/language.unused-assignment/out index 3e67ae5ef6..3fd1b63456 100644 --- a/testing/btest/Baseline.zam/language.unused-assignment/out +++ b/testing/btest/Baseline.zam/language.unused-assignment/out @@ -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: "-O optimize-AST" option is incompatible with -u option, deactivating optimization -warning: please_warn assignment unused: please_warn = test; <...>/unused-assignment.zeek, line 7 +warning: please_warn assignment unused: please_warn = test; <...>/unused-assignment.zeek, line 10 diff --git a/testing/btest/Baseline.zam/language.vector-deprecated/.stderr b/testing/btest/Baseline.zam/language.vector-deprecated/.stderr index 54a209f546..4a79ecc126 100644 --- a/testing/btest/Baseline.zam/language.vector-deprecated/.stderr +++ b/testing/btest/Baseline.zam/language.vector-deprecated/.stderr @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -warning in /Users/vern/warehouse/zeek/zeek-master.29Jul22/testing/btest/.tmp/language.vector-deprecated/vector-deprecated.zeek, line 18: mixing vector and scalar operands is deprecated (vector) (string) -warning in /Users/vern/warehouse/zeek/zeek-master.29Jul22/testing/btest/.tmp/language.vector-deprecated/vector-deprecated.zeek, line 21: mixing vector and scalar operands is deprecated (string) (vector) -warning in /Users/vern/warehouse/zeek/zeek-master.29Jul22/testing/btest/.tmp/language.vector-deprecated/vector-deprecated.zeek, line 24: mixing vector and scalar operands is deprecated (string) (vector) +warning in <...>/vector-deprecated.zeek, line 18: mixing vector and scalar operands is deprecated (vector) (string) +warning in <...>/vector-deprecated.zeek, line 21: mixing vector and scalar operands is deprecated (string) (vector) +warning in <...>/vector-deprecated.zeek, line 24: mixing vector and scalar operands is deprecated (string) (vector) error: deprecated mixed vector/scalar operation not supported for ZAM compiling error: deprecated mixed vector/scalar operation not supported for ZAM compiling error: deprecated mixed vector/scalar operation not supported for ZAM compiling diff --git a/testing/btest/Baseline.zam/scripts.base.protocols.ssl.prevent-disable-analyzer/.stdout b/testing/btest/Baseline.zam/scripts.base.protocols.ssl.prevent-disable-analyzer/.stdout new file mode 100644 index 0000000000..229c675729 --- /dev/null +++ b/testing/btest/Baseline.zam/scripts.base.protocols.ssl.prevent-disable-analyzer/.stdout @@ -0,0 +1,11 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +analyzer_confirmation, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], AllAnalyzers::ANALYZER_ANALYZER_SSL, 3 +encrypted_data, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], T, 22, 32, 1 +established, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp] +disabling_analyzer, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], AllAnalyzers::ANALYZER_ANALYZER_SSL, 3 +preventing disabling_analyzer, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], AllAnalyzers::ANALYZER_ANALYZER_SSL, 3 +encrypted_data, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], F, 22, 32, 2 +encrypted_data, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], T, 23, 31, 3 +encrypted_data, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], T, 23, 17, 4 +disabling_analyzer, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], AllAnalyzers::ANALYZER_ANALYZER_SSL, 3 +allowing disabling_analyzer, [orig_h=10.0.0.80, orig_p=56637/tcp, resp_h=68.233.76.12, resp_p=443/tcp], AllAnalyzers::ANALYZER_ANALYZER_SSL, 3