From 85b8c8866bdda68e809181caf8d50339ae48ea6d Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 17 Apr 2025 15:32:11 +0200 Subject: [PATCH] testing/btest/*zeek: Comment all @TEST lines --- testing/btest/bifs/cat_sep_errors.zeek | 8 +- .../btest/bifs/community_id/run-pcaps.zeek | 4 +- testing/btest/bifs/find_in_zeekpath.zeek | 12 +-- testing/btest/bifs/from_json.zeek | 26 +++---- testing/btest/bifs/get_matcher_stats.zeek | 4 +- testing/btest/bifs/hll_cluster.zeek | 4 +- testing/btest/bifs/unique_id-pools.zeek | 8 +- testing/btest/broker/connect-on-retry.zeek | 8 +- testing/btest/broker/disconnect.zeek | 8 +- testing/btest/broker/error.zeek | 4 +- .../btest/broker/event-group-interaction.zeek | 8 +- .../broker/publish_unspecified_table.zeek | 12 +-- testing/btest/broker/python-bindings.zeek | 8 +- testing/btest/broker/remote_event.zeek | 8 +- testing/btest/broker/remote_event_any.zeek | 8 +- testing/btest/broker/remote_event_auto.zeek | 8 +- .../broker/remote_event_index_types.zeek | 12 +-- .../btest/broker/remote_event_ssl_auth.zeek | 28 +++---- .../btest/broker/remote_event_ts_compat.zeek | 4 +- .../btest/broker/remote_event_vector_any.zeek | 8 +- testing/btest/broker/remote_id.zeek | 8 +- testing/btest/broker/remote_log.zeek | 12 +-- testing/btest/broker/remote_log_batch.zeek | 12 +-- .../btest/broker/remote_log_late_join.zeek | 12 +-- testing/btest/broker/remote_log_types.zeek | 12 +-- testing/btest/broker/ssl_auth_failure.zeek | 24 +++--- .../broker/store/brokerstore-attr-clone.zeek | 16 ++-- .../broker/store/brokerstore-attr-expire.zeek | 12 +-- .../brokerstore-attr-persistence-clone.zeek | 16 ++-- .../store/brokerstore-attr-persistence.zeek | 12 +-- .../broker/store/brokerstore-attr-simple.zeek | 12 +-- ...kerstore-backend-delete-composite-key.zeek | 4 +- ...okerstore-backend-simple-incompatible.zeek | 12 +-- .../brokerstore-backend-simple-reverse.zeek | 20 ++--- .../store/brokerstore-backend-simple.zeek | 16 ++-- ...okerstore-backend-sqlite-incompatible.zeek | 8 +- .../store/brokerstore-backend-sqlite.zeek | 20 ++--- testing/btest/broker/store/clone.zeek | 8 +- testing/btest/broker/unpeer.zeek | 8 +- .../broker/web-socket-events-metadata.zeek | 4 +- testing/btest/broker/web-socket-events.zeek | 4 +- .../btest/cluster/broker/cluster-publish.zeek | 8 +- testing/btest/cluster/broker/publish-any.zeek | 16 ++-- testing/btest/cluster/generic/logging-rr.zeek | 16 ++-- .../cluster/websocket/bad-event-args.zeek | 8 +- .../cluster/websocket/bad-subscriptions.zeek | 8 +- testing/btest/cluster/websocket/bad-url.zeek | 8 +- .../btest/cluster/websocket/cluster-log.zeek | 8 +- .../cluster/websocket/one-pipelining.zeek | 8 +- testing/btest/cluster/websocket/one.zeek | 8 +- testing/btest/cluster/websocket/three.zeek | 8 +- testing/btest/cluster/websocket/tls.zeek | 12 +-- .../cluster/websocket/two-pipelining.zeek | 8 +- testing/btest/cluster/websocket/zeromq.zeek | 16 ++-- .../btest/core/dict-iteration-expire4.zeek | 8 +- .../btest/core/dict-iteration-expire5.zeek | 8 +- testing/btest/core/discarder.zeek | 16 ++-- testing/btest/core/event-groups/errors.zeek | 6 +- .../btest/core/file-analyzer-violation.zeek | 4 +- testing/btest/core/load-file-extension.zeek | 28 +++---- testing/btest/core/load-pkg.zeek | 8 +- testing/btest/core/load-prefixes.zeek | 16 ++-- testing/btest/core/load-relative.zeek | 12 +-- testing/btest/core/load-unload.zeek | 12 +-- testing/btest/core/network_time/broker.zeek | 8 +- testing/btest/core/option-errors.zeek | 4 +- testing/btest/core/option-runtime-errors.zeek | 24 +++--- .../parse-only-signature-file-issues.zeek | 8 +- testing/btest/core/pcap/wrong-format.zeek | 4 +- .../btest/core/record-field-redef-errors.zeek | 24 +++--- testing/btest/core/reporter-paths.zeek | 4 +- .../btest/core/suspend_processing/broker.zeek | 8 +- .../btest/core/suspend_processing/config.zeek | 4 +- .../btest/coverage/zeek-profiler-file.zeek | 8 +- .../btest/doc/zeekygen/declaring_script.zeek | 16 ++-- testing/btest/doc/zeekygen/enums.zeek | 4 +- testing/btest/doc/zeekygen/example.zeek | 4 +- testing/btest/doc/zeekygen/func-params.zeek | 4 +- testing/btest/doc/zeekygen/identifier.zeek | 4 +- .../zeekygen/identifier_without_script.zeek | 4 +- testing/btest/doc/zeekygen/package.zeek | 4 +- testing/btest/doc/zeekygen/package_index.zeek | 4 +- testing/btest/doc/zeekygen/records.zeek | 4 +- testing/btest/doc/zeekygen/script_index.zeek | 4 +- .../btest/doc/zeekygen/script_summary.zeek | 4 +- testing/btest/doc/zeekygen/type-aliases.zeek | 4 +- testing/btest/doc/zeekygen/vectors.zeek | 4 +- .../alternate-prototypes-default-args.zeek | 4 +- .../alternate-prototypes-deprecated-args.zeek | 4 +- .../any-script-func-variadic-errors.zeek | 2 +- testing/btest/language/assert-error.zeek | 6 +- testing/btest/language/assert-hook.zeek | 14 ++-- testing/btest/language/assert.zeek | 14 ++-- testing/btest/language/at-deprecated.zeek | 12 +-- testing/btest/language/at-dir.zeek | 4 +- testing/btest/language/at-if-lambda.zeek | 6 +- testing/btest/language/at-if-reject.zeek | 8 +- testing/btest/language/at-ifdef.zeek | 8 +- testing/btest/language/at-ifndef.zeek | 8 +- testing/btest/language/blank-expr-errors.zeek | 8 +- .../language/closure-sending-naming.zeek | 8 +- testing/btest/language/closure-sending2.zeek | 8 +- testing/btest/language/common-mistakes.zeek | 8 +- testing/btest/language/const.zeek | 8 +- testing/btest/language/crlf-parsing.zeek | 8 +- testing/btest/language/deprecated.zeek | 8 +- testing/btest/language/eof-parse-errors.zeek | 8 +- testing/btest/language/function-sending.zeek | 8 +- .../language/global-colon-colon-errors.zeek | 10 +-- testing/btest/language/hook_calls.zeek | 8 +- testing/btest/language/nested-sets.zeek | 4 +- .../language/next-break-context-errors.zeek | 16 ++-- .../language/paraglob-serialization.zeek | 8 +- .../redeclaration-redefinition-errors.zeek | 20 ++--- testing/btest/language/sizeof-any.zeek | 4 +- .../language/table-default-insert-errors.zeek | 12 +-- .../btest/language/trailing-comma-error.zeek | 22 +++--- testing/btest/language/trailing-comma.zeek | 2 +- .../btest/language/type-coerce-numerics.zeek | 20 ++--- testing/btest/plugins/enum-bif-plugin.zeek | 12 +-- testing/btest/plugins/hooks.zeek | 12 +-- ...isable-certificate-events-known-certs.zeek | 8 +- .../files/x509/x509_check_cert_hostname.zeek | 16 ++-- .../cluster/custom_pool_exclusivity.zeek | 4 +- .../cluster/custom_pool_limits.zeek | 4 +- .../base/frameworks/cluster/forwarding.zeek | 4 +- .../leftover-log-rotation-multi-logger.zeek | 4 +- .../frameworks/cluster/log_distribution.zeek | 4 +- .../cluster/start-it-up-logger.zeek | 4 +- .../base/frameworks/cluster/start-it-up.zeek | 4 +- .../cluster/topic_distribution.zeek | 4 +- .../cluster/topic_distribution_bifs.zeek | 4 +- .../topic_distribution_make_event.zeek | 4 +- .../scripts/base/frameworks/config/basic.zeek | 4 +- .../base/frameworks/config/basic_cluster.zeek | 4 +- .../frameworks/config/cluster_resend.zeek | 4 +- .../frameworks/config/missing-enum-value.zeek | 4 +- .../base/frameworks/config/read_config.zeek | 4 +- .../config/read_config_cluster.zeek | 8 +- .../base/frameworks/config/several-files.zeek | 8 +- .../base/frameworks/config/updates.zeek | 16 ++-- .../control/configuration_update.zeek | 4 +- .../base/frameworks/control/id_value.zeek | 4 +- .../frameworks/file-analysis/input/basic.zeek | 4 +- .../file-analysis/logging-input-analysis.zeek | 4 +- .../base/frameworks/input/bad_patterns.zeek | 4 +- .../scripts/base/frameworks/input/basic.zeek | 4 +- .../base/frameworks/input/bignumber.zeek | 4 +- .../scripts/base/frameworks/input/binary.zeek | Bin 1116 -> 1120 bytes .../base/frameworks/input/config/basic.zeek | 4 +- .../frameworks/input/config/enum-set.zeek | 4 +- .../base/frameworks/input/config/errors.zeek | 4 +- .../base/frameworks/input/config/spaces.zeek | 4 +- .../base/frameworks/input/default.zeek | 4 +- .../input/empty-values-hashing.zeek | 8 +- .../base/frameworks/input/emptyvals.zeek | 8 +- .../scripts/base/frameworks/input/errors.zeek | 4 +- .../scripts/base/frameworks/input/event.zeek | 4 +- .../base/frameworks/input/from_json.zeek | 4 +- .../input/invalid-lines-duplicate.zeek | 4 +- .../base/frameworks/input/invalid-lines.zeek | 4 +- .../base/frameworks/input/invalidnumbers.zeek | 4 +- .../base/frameworks/input/invalidset.zeek | 4 +- .../base/frameworks/input/invalidtable.zeek | 4 +- .../base/frameworks/input/invalidtext.zeek | 4 +- .../base/frameworks/input/missing-enum.zeek | 4 +- .../input/missing-file-initially.zeek | 4 +- .../frameworks/input/missing-table-value.zeek | 4 +- .../frameworks/input/onecolumn-norecord.zeek | 4 +- .../frameworks/input/onecolumn-record.zeek | 4 +- .../base/frameworks/input/optional.zeek | 4 +- .../input/path-prefix/absolute-prefix.zeek | 8 +- .../input/path-prefix/absolute-source.zeek | 8 +- .../input/path-prefix/no-paths.zeek | 8 +- .../input/path-prefix/relative-prefix.zeek | 8 +- .../base/frameworks/input/patterns.zeek | 4 +- .../base/frameworks/input/port-embedded.zeek | 4 +- .../scripts/base/frameworks/input/port.zeek | 4 +- .../frameworks/input/predicate-stream.zeek | 4 +- .../base/frameworks/input/predicate.zeek | 4 +- .../frameworks/input/predicatemodify.zeek | 4 +- .../input/predicatemodifyandreread.zeek | 20 ++--- .../predicaterefusesecondsamerecord.zeek | 4 +- .../base/frameworks/input/raw/basic.zeek | 4 +- .../base/frameworks/input/raw/execute.zeek | 4 +- .../input/raw/executestream-leftover.zeek | 4 +- .../raw/executestream-no-last-separator.zeek | 4 +- .../input/raw/executestream-slow-long.zeek | 4 +- .../input/raw/executestream-slow.zeek | 4 +- .../frameworks/input/raw/executestream.zeek | 12 +-- .../base/frameworks/input/raw/offset.zeek | 4 +- .../base/frameworks/input/raw/rereadraw.zeek | 8 +- .../base/frameworks/input/raw/rereadraw2.zeek | 4 +- .../base/frameworks/input/raw/streamraw.zeek | 12 +-- .../base/frameworks/input/raw/streamtail.zeek | 12 +-- .../frameworks/input/raw/streamtail2.zeek | 12 +-- .../scripts/base/frameworks/input/repeat.zeek | 4 +- .../scripts/base/frameworks/input/reread.zeek | 20 ++--- .../frameworks/input/set-event-reread.zeek | 12 +-- .../frameworks/input/set-event-stream.zeek | 8 +- .../scripts/base/frameworks/input/set.zeek | 4 +- .../base/frameworks/input/setseparator.zeek | 4 +- .../frameworks/input/setspecialcases.zeek | 4 +- .../base/frameworks/input/sqlite/basic.zeek | 4 +- .../base/frameworks/input/sqlite/error.zeek | 4 +- .../base/frameworks/input/sqlite/port.zeek | 4 +- .../base/frameworks/input/sqlite/types.zeek | 4 +- .../scripts/base/frameworks/input/stream.zeek | 12 +-- .../frameworks/input/subrecord-event.zeek | 4 +- .../base/frameworks/input/subrecord.zeek | 4 +- .../base/frameworks/input/tableevent.zeek | 4 +- .../base/frameworks/input/twotables.zeek | 12 +-- .../frameworks/input/unsupported_types.zeek | 4 +- .../base/frameworks/input/windows.zeek | 4 +- .../cluster-transparency-with-proxy.zeek | 4 +- .../intel/cluster-transparency.zeek | 4 +- .../base/frameworks/intel/filter-item.zeek | 4 +- .../frameworks/intel/input-and-match.zeek | 4 +- .../input-intel-absolute-prefixes.zeek | 4 +- .../input-intel-relative-prefixes.zeek | 4 +- .../intel/path-prefix/input-prefix.zeek | 4 +- .../intel/path-prefix/no-paths.zeek | 4 +- .../intel/read-file-dist-cluster.zeek | 8 +- .../base/frameworks/logging/delay/basic.zeek | 12 +-- .../base/frameworks/logging/delay/coerce.zeek | 4 +- .../logging/delay/delay-cb-redelay.zeek | 6 +- .../frameworks/logging/delay/delay-cb.zeek | 14 ++-- .../base/frameworks/logging/delay/errors.zeek | 10 +-- .../frameworks/logging/delay/multi-write.zeek | 4 +- .../logging/delay/nested-write.zeek | 6 +- .../logging/delay/queue-setter.zeek | 6 +- .../frameworks/logging/delay/queue-size.zeek | 4 +- .../frameworks/logging/delay/queue-test.zeek | 16 ++-- .../logging/delay/static-errors.zeek | 6 +- .../field-extension-cluster-error.zeek | 4 +- .../logging/field-extension-cluster.zeek | 4 +- .../base/frameworks/logging/hooks.zeek | 24 +++--- .../base/frameworks/logging/sqlite/error.zeek | 4 +- .../base/frameworks/netcontrol/acld-hook.zeek | 8 +- .../base/frameworks/netcontrol/acld.zeek | 8 +- .../frameworks/netcontrol/basic-cluster.zeek | 4 +- .../base/frameworks/netcontrol/broker.zeek | 8 +- .../netcontrol/rule-added-hook.zeek | 2 +- .../base/frameworks/notice/cluster.zeek | 4 +- .../frameworks/notice/file-info-no-conns.zeek | 4 +- .../notice/suppression-cluster.zeek | 4 +- .../frameworks/openflow/broker-basic.zeek | 8 +- .../base/frameworks/openflow/log-cluster.zeek | 4 +- .../frameworks/storage/redis-cluster.zeek | 4 +- .../frameworks/sumstats/basic-cluster.zeek | 4 +- .../sumstats/cluster-intermediate-update.zeek | 4 +- .../frameworks/sumstats/last-cluster.zeek | 4 +- .../sumstats/manual-epoch-cluster.zeek | 4 +- .../sumstats/on-demand-cluster.zeek | 4 +- .../frameworks/sumstats/sample-cluster.zeek | 4 +- .../frameworks/sumstats/topk-cluster.zeek | 4 +- .../base/frameworks/telemetry/sync.zeek | 4 +- testing/btest/scripts/base/misc/version.zeek | 2 +- .../base/protocols/bittorrent/tracker.zeek | 4 +- .../scripts/base/protocols/dhcp/cluster.zeek | 4 +- .../base/protocols/socks/socks-auth.zeek | 2 +- .../btest/scripts/base/utils/packages.zeek | 8 +- .../frameworks/cluster/cluster_started.zeek | 4 +- .../cluster/cluster_started_logger.zeek | 4 +- .../policy/frameworks/intel/removal.zeek | 4 +- .../policy/frameworks/intel/seen/certs.zeek | 4 +- .../seen/filename-in-http-get-response.zeek | 4 +- .../intel/seen/filename-in-http-post.zeek | 4 +- .../policy/frameworks/intel/seen/smb.zeek | 4 +- .../frameworks/intel/seen/smtp-cluster.zeek | 8 +- .../policy/frameworks/intel/seen/smtp.zeek | 4 +- .../catch-and-release-two-plugins.zeek | 2 +- .../netcontrol/catch-and-release.zeek | 2 +- .../frameworks/telemetry/prometheus.zeek | 8 +- .../policy/misc/weird-stats-cluster.zeek | 4 +- .../detect-external-names-mdns-broadcast.zeek | 2 +- .../protocols/ssl/decryption-keylog.zeek | 4 +- .../btest/signatures/bad-eval-condition.zeek | 4 +- .../btest/signatures/custom-event-errors.zeek | 4 +- testing/btest/signatures/custom-event.zeek | 4 +- testing/btest/signatures/dpd.zeek | 4 +- testing/btest/signatures/dst-ip-cidr-v4.zeek | 4 +- .../dst-ip-header-condition-v4-masks.zeek | 28 +++---- .../dst-ip-header-condition-v4.zeek | 28 +++---- .../dst-ip-header-condition-v6-masks.zeek | 28 +++---- .../dst-ip-header-condition-v6.zeek | 28 +++---- .../signatures/dst-port-header-condition.zeek | 68 ++++++++--------- .../eval-condition-no-return-value.zeek | 4 +- testing/btest/signatures/eval-condition.zeek | 4 +- .../signatures/header-header-condition.zeek | 32 ++++---- testing/btest/signatures/http-body-match.zeek | 4 +- testing/btest/signatures/id-lookup.zeek | 4 +- .../signatures/ip-proto-header-condition.zeek | 16 ++-- testing/btest/signatures/load-sigs.zeek | 4 +- .../signatures/signature-cond-used-twice.zeek | 4 +- .../btest/signatures/signature-cond-used.zeek | 4 +- .../src-ip-header-condition-v4-masks.zeek | 28 +++---- .../src-ip-header-condition-v4.zeek | 28 +++---- .../src-ip-header-condition-v6-masks.zeek | 28 +++---- .../src-ip-header-condition-v6.zeek | 28 +++---- .../signatures/src-port-header-condition.zeek | 72 +++++++++--------- .../btest/signatures/tcp-end-of-match.zeek | 4 +- .../signatures/tcp-syn-with-payload.zeek | 4 +- .../btest/signatures/udp-end-of-match.zeek | 4 +- .../udp-packetwise-insensitive.zeek | 4 +- .../signatures/udp-packetwise-match.zeek | 4 +- .../btest/signatures/udp-payload-size.zeek | 4 +- testing/btest/signatures/udp-state.zeek | 8 +- testing/btest/spicy/list-conversion.zeek | 8 +- testing/btest/spicy/type-converter.zeek | 8 +- testing/btest/supervisor/config-scripts.zeek | 12 +-- 311 files changed, 1272 insertions(+), 1272 deletions(-) diff --git a/testing/btest/bifs/cat_sep_errors.zeek b/testing/btest/bifs/cat_sep_errors.zeek index b743381c7e..301656b0e9 100644 --- a/testing/btest/bifs/cat_sep_errors.zeek +++ b/testing/btest/bifs/cat_sep_errors.zeek @@ -6,27 +6,27 @@ event zeek_init() print cat_sep(); } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { print cat_sep("sep"); } -@TEST-START-NEXT +# @TEST-START-NEXT # bad types 1 event zeek_init() { print cat_sep("sep", 1); } -@TEST-START-NEXT +# @TEST-START-NEXT # bad types 2 event zeek_init() { print cat_sep(1, "default"); } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { print cat_sep([$a=1], "default"); diff --git a/testing/btest/bifs/community_id/run-pcaps.zeek b/testing/btest/bifs/community_id/run-pcaps.zeek index cd4391bbec..9e68cb54e9 100644 --- a/testing/btest/bifs/community_id/run-pcaps.zeek +++ b/testing/btest/bifs/community_id/run-pcaps.zeek @@ -15,8 +15,8 @@ for pcap in $(cd $TRACES/communityid && ls *.pcap); do btest-diff $pcap.out done -@TEST-START-FILE test-community-id-v1.zeek +# @TEST-START-FILE test-community-id-v1.zeek event connection_state_remove(c: connection) { print c$id, community_id_v1(c$id); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/bifs/find_in_zeekpath.zeek b/testing/btest/bifs/find_in_zeekpath.zeek index bc212cb15c..2124769e56 100644 --- a/testing/btest/bifs/find_in_zeekpath.zeek +++ b/testing/btest/bifs/find_in_zeekpath.zeek @@ -38,22 +38,22 @@ print "find_in_zeekpath pkg1.zeek", find_in_zeekpath("pkg1.zeek"); print "find_in_zeekpath pkg2", find_in_zeekpath("pkg2"); print "find_in_zeekpath pkg3", find_in_zeekpath("pkg3"); -@TEST-START-FILE pkg1.zeek +# @TEST-START-FILE pkg1.zeek event zeek_init() { print "pkg1!"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE pkg2/__load__.zeek +# @TEST-START-FILE pkg2/__load__.zeek event zeek_init() { print "pkg2!"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE errors.zeek +# @TEST-START-FILE errors.zeek # Using relative and absolute paths is an error (empty string) print "relative", find_in_zeekpath("./pkg1.zeek"); print "absolute", find_in_zeekpath("/pkg1"); -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/bifs/from_json.zeek b/testing/btest/bifs/from_json.zeek index 31d3438e7c..576e623acf 100644 --- a/testing/btest/bifs/from_json.zeek +++ b/testing/btest/bifs/from_json.zeek @@ -38,21 +38,21 @@ event zeek_init() print from_json(json, Foo); } -@TEST-START-NEXT +# @TEST-START-NEXT # argument type mismatch event zeek_init() { print from_json("[]", 10); } -@TEST-START-NEXT +# @TEST-START-NEXT # JSON parse error event zeek_init() { print from_json("{\"hel", string_vec); } -@TEST-START-NEXT +# @TEST-START-NEXT type bool_t: bool; type Foo: record { a: bool; @@ -65,14 +65,14 @@ event zeek_init() print from_json("{\"a\": \"hello\"}", Foo); } -@TEST-START-NEXT +# @TEST-START-NEXT # type unsupport error event zeek_init() { print from_json("[]", table_string_of_string); } -@TEST-START-NEXT +# @TEST-START-NEXT type port_t: port; # additional & incorrect port formats event zeek_init() @@ -84,7 +84,7 @@ event zeek_init() print from_json("{}", port_t); } -@TEST-START-NEXT +# @TEST-START-NEXT type set_t: set[int, bool]; # index type doesn't match event zeek_init() @@ -93,7 +93,7 @@ event zeek_init() print from_json("[[1, false], [2, 1]]", set_t); } -@TEST-START-NEXT +# @TEST-START-NEXT type pattern_t: pattern; # pattern compile error event zeek_init() @@ -101,7 +101,7 @@ event zeek_init() print from_json("\"/([[:print:]]{-}[[:alnum:]]foo)/\"", pattern_t); } -@TEST-START-NEXT +# @TEST-START-NEXT type Color: enum { Red = 10 }; @@ -111,7 +111,7 @@ event zeek_init() print from_json("\"Yellow\"", Color); } -@TEST-START-NEXT +# @TEST-START-NEXT # container null event zeek_init() { @@ -119,7 +119,7 @@ event zeek_init() print from_json("[\"1\",null,\"3\",\"4\"]", string_vec); } -@TEST-START-NEXT +# @TEST-START-NEXT type Foo: record { hello: string; t: bool; @@ -131,7 +131,7 @@ event zeek_init() print from_json("{\"hello\": null, \"t\": true}", Foo); } -@TEST-START-NEXT +# @TEST-START-NEXT type Foo: record { hello: string; }; @@ -141,7 +141,7 @@ event zeek_init() print from_json("{\"hello\": \"Hello!\", \"t\": true}", Foo); } -@TEST-START-NEXT +# @TEST-START-NEXT type Foo: record { id_field: string; }; @@ -154,7 +154,7 @@ event zeek_init() }); } -@TEST-START-NEXT +# @TEST-START-NEXT # From: https://www.rfc-editor.org/rfc/rfc8520#section-9 global input:string = "{\"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\":true,\"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:src-dnsname\":\"test.example.com\",\"protocol\":6},\"tcp\":{\"ietf-mud:direction-initiated\":\"from-device\",\"source-port\":{\"operator\":\"eq\",\"port\":443}}},\"actions\":{\"forwarding\":\"accept\"}}]}},{\"name\":\"mud-76100-v6fr\",\"type\":\"ipv6-acl-type\",\"aces\":{\"ace\":[{\"name\":\"cl0-frdev\",\"matches\":{\"ipv6\":{\"ietf-acldns:dst-dnsname\":\"test.example.com\",\"protocol\":6},\"tcp\":{\"ietf-mud:direction-initiated\":\"from-device\",\"destination-port\":{\"operator\":\"eq\",\"port\":443}}},\"actions\":{\"forwarding\":\"accept\"}}]}}]}}"; diff --git a/testing/btest/bifs/get_matcher_stats.zeek b/testing/btest/bifs/get_matcher_stats.zeek index 5126f614dd..62d8f07160 100644 --- a/testing/btest/bifs/get_matcher_stats.zeek +++ b/testing/btest/bifs/get_matcher_stats.zeek @@ -1,14 +1,14 @@ # # @TEST-EXEC: zeek -b -s mysig %INPUT -@TEST-START-FILE mysig.sig +# @TEST-START-FILE mysig.sig signature my_ftp_client { ip-proto == tcp payload /(|.*[\n\r]) *[uU][sS][eE][rR] / tcp-state originator event "matched my_ftp_client" } -@TEST-END-FILE +# @TEST-END-FILE event zeek_init() { diff --git a/testing/btest/bifs/hll_cluster.zeek b/testing/btest/bifs/hll_cluster.zeek index d026d6850d..ce5bd70340 100644 --- a/testing/btest/bifs/hll_cluster.zeek +++ b/testing/btest/bifs/hll_cluster.zeek @@ -14,13 +14,13 @@ @load base/frameworks/cluster -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/bifs/unique_id-pools.zeek b/testing/btest/bifs/unique_id-pools.zeek index 6d85276771..46b1484d1d 100644 --- a/testing/btest/bifs/unique_id-pools.zeek +++ b/testing/btest/bifs/unique_id-pools.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: zeek -b order_base | sort >out.2 # @TEST-EXEC: cmp out.1 out.2 -@TEST-START-FILE order_rand.zeek +# @TEST-START-FILE order_rand.zeek print unique_id("A-"); print unique_id_from(5, "E-"); @@ -12,9 +12,9 @@ print unique_id_from(4, "D-"); print unique_id("C-"); print unique_id_from(5, "F-"); -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE order_base.zeek +# @TEST-START-FILE order_base.zeek print unique_id("A-"); print unique_id("B-"); @@ -23,5 +23,5 @@ print unique_id_from(4, "D-"); print unique_id_from(5, "E-"); print unique_id_from(5, "F-"); -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/connect-on-retry.zeek b/testing/btest/broker/connect-on-retry.zeek index 2db0bd5237..630fbc8479 100644 --- a/testing/btest/broker/connect-on-retry.zeek +++ b/testing/btest/broker/connect-on-retry.zeek @@ -9,7 +9,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek # Using btest's environment settings for connect/listen retry of 1sec. redef exit_only_after_terminate = T; @@ -47,10 +47,10 @@ event pong(msg: string, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -97,4 +97,4 @@ event ping(msg: string, n: count) Broker::publish("zeek/event/my_topic", pong, msg, n); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/disconnect.zeek b/testing/btest/broker/disconnect.zeek index 701172eeb6..4bfbfc32dc 100644 --- a/testing/btest/broker/disconnect.zeek +++ b/testing/btest/broker/disconnect.zeek @@ -14,7 +14,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff recv2/recv2.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -58,10 +58,10 @@ event Broker::endpoint_unreachable(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -99,4 +99,4 @@ event Broker::endpoint_unreachable(endpoint: Broker::EndpointInfo, msg: string) print "endpoint unreachable", msg; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/error.zeek b/testing/btest/broker/error.zeek index c2686274b7..9f2ad74e61 100644 --- a/testing/btest/broker/error.zeek +++ b/testing/btest/broker/error.zeek @@ -4,7 +4,7 @@ # @TEST-EXEC: btest-diff send.out # -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -38,5 +38,5 @@ event zeek_init() } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/event-group-interaction.zeek b/testing/btest/broker/event-group-interaction.zeek index 04ec380e80..0e64d5c494 100644 --- a/testing/btest/broker/event-group-interaction.zeek +++ b/testing/btest/broker/event-group-interaction.zeek @@ -13,7 +13,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek global event_count = 0; @@ -61,10 +61,10 @@ event zeek_init() disable_module_events("TestDumpEvents"); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -116,4 +116,4 @@ event zeek_init() disable_module_events("TestDumpEvents"); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/publish_unspecified_table.zeek b/testing/btest/broker/publish_unspecified_table.zeek index 81aaf21742..12ceedadd5 100644 --- a/testing/btest/broker/publish_unspecified_table.zeek +++ b/testing/btest/broker/publish_unspecified_table.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek type ResultTable: table[string] of count; type ResultSet : set[count]; @@ -20,9 +20,9 @@ global pong: event(msg: string, t: ResultTable) &is_used; global ping_set: event(msg: string, s: ResultSet) &is_used; global pong_set: event(msg: string, s: ResultSet) &is_used; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load ./common.zeek redef exit_only_after_terminate = T; @@ -72,10 +72,10 @@ event pong_set(msg: string, s: ResultSet) if ( event_count % 4 == 0 ) send_events(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common.zeek redef exit_only_after_terminate = T; @@ -118,4 +118,4 @@ event ping_set(msg: string, s: ResultSet) print "ping_set", msg, |s|; Broker::publish("zeek/event/my_topic", pong_set, msg, s); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/python-bindings.zeek b/testing/btest/broker/python-bindings.zeek index 30380e7805..806c14a8e6 100644 --- a/testing/btest/broker/python-bindings.zeek +++ b/testing/btest/broker/python-bindings.zeek @@ -14,7 +14,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff recv/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff send/.stdout -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek global new_conn_added: event(c: connection) &is_used; global conn_removed: event(c: connection) &is_used; @@ -81,10 +81,10 @@ event echo_from_python(what: string, c: connection) &is_used ++events_from_python; print network_time(), "from_python", events_from_python, what, c$uid, c$id; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.py +# @TEST-START-FILE recv.py """ Python script subscribing to TOPIC """ @@ -134,4 +134,4 @@ with ( broker.Endpoint() as ep, other_event = broker.zeek.Event("echo_from_python", my_event.name(), conn) ep.publish(broker_topic, other_event) -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event.zeek b/testing/btest/broker/remote_event.zeek index 611f9067ac..de44ae87cd 100644 --- a/testing/btest/broker/remote_event.zeek +++ b/testing/btest/broker/remote_event.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -54,10 +54,10 @@ event pong(msg: string, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -104,4 +104,4 @@ event zeek_done() print get_broker_stats(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_any.zeek b/testing/btest/broker/remote_event_any.zeek index c096318717..8bd37a36a5 100644 --- a/testing/btest/broker/remote_event_any.zeek +++ b/testing/btest/broker/remote_event_any.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -57,10 +57,10 @@ event pong(msg: string, n: any) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -112,4 +112,4 @@ event zeek_done() print get_broker_stats(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_auto.zeek b/testing/btest/broker/remote_event_auto.zeek index 429a11c07a..25225bcc59 100644 --- a/testing/btest/broker/remote_event_auto.zeek +++ b/testing/btest/broker/remote_event_auto.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -49,10 +49,10 @@ event pong(msg: string, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -95,4 +95,4 @@ event ping(msg: string, n: count) event pong(msg, n); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_index_types.zeek b/testing/btest/broker/remote_event_index_types.zeek index e04effad0c..069e3e831d 100644 --- a/testing/btest/broker/remote_event_index_types.zeek +++ b/testing/btest/broker/remote_event_index_types.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; type MyRecord: record { @@ -52,9 +52,9 @@ global tablefunction: event(x: TableFunction); global tablepattern: event(x: TablePattern); global done: event(); -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load ./common.zeek event zeek_init() @@ -81,9 +81,9 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) { terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common.zeek event set1(x: Set1) @@ -123,4 +123,4 @@ event done() event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) { terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_ssl_auth.zeek b/testing/btest/broker/remote_event_ssl_auth.zeek index 63acd24683..cc4b052607 100644 --- a/testing/btest/broker/remote_event_ssl_auth.zeek +++ b/testing/btest/broker/remote_event_ssl_auth.zeek @@ -12,7 +12,7 @@ # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE cert.1.pem +# @TEST-START-FILE cert.1.pem -----BEGIN CERTIFICATE----- MIIDOjCCAiICCQDz7oMOR7Wm7jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV UzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCEJlcmtlbGV5MSMwIQYDVQQKDBpBQ01F @@ -33,9 +33,9 @@ NosoTmGCV0HecWN4l38ojnXd44aSktQIND9iCLus3S6++nFnX5DHGZiv6/SnSO/6 +Op7nV0A6zKVcMOYQ0SGZPD8UQs5wDJgrR9LY29Ox5QBwu/5NqyvNSrMQaTop5vb wkMInaq5lLxEYQDSLBc= -----END CERTIFICATE----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE cert.2.pem +# @TEST-START-FILE cert.2.pem -----BEGIN CERTIFICATE----- MIIDOjCCAiICCQDz7oMOR7Wm7TANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV UzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCEJlcmtlbGV5MSMwIQYDVQQKDBpBQ01F @@ -56,9 +56,9 @@ hJVdY6LXh27O0ZUllhQ/ig9c+dYFh6AHoZU7WjiNKIyWuyl4IAOkQ4IEdsBvst+l XZvT6+i8fWvkGv18iunm23Yu+8Zf08wTXnbqXvmMda5upAYLmwD0YKIVYC3ycihh mkYCYI6PVeH63a2/zxw= -----END CERTIFICATE----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE key.1.pem +# @TEST-START-FILE key.1.pem -----BEGIN RSA PRIVATE KEY----- MIIEogIBAAKCAQEAx6G3HAEEKm2QDXTncfOdlv51MxnMKbqzovM24fcgsTMJxTKI FvQLKihJ3bMqVegIf3CM+OTwIAnRIPtaXNgxu/hNPkJVeAoTcAg7pPhUlgeqajEw @@ -86,9 +86,9 @@ Dwd/AoGAILn8pVC9dIFac2BDOFU5y9ZvMmZAvwRxh9vEWewNvkzg27vdYc+rCHNm I7H0S/RqfqVeo0ApE5PQ8Sll6RvxN/mbSQo9YeCDGQ1r1rNe4Vs12GAYXAbE4ipf BTdqMbieumB/zL97iK5baHUFEJ4VRtLQhh/SOXgew/BF8ccpilI= -----END RSA PRIVATE KEY----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE key.2.pem +# @TEST-START-FILE key.2.pem -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAxvXwL1vap4YxkZi6QPvkbzh2nrLuzYlEL8X9heoBdqyyVdP/ g0gPz87RL9ViWhoYCUmhKlI2h5Nx2NhCpWxlxD4dZsaoD2Q+aZRpbuHXU8LrcQsc @@ -116,9 +116,9 @@ K8ZK3KECgYEApNoI5Mr5tmtjq4sbZrgQq6cMlfkIj9gUubOzFCryUb6NaB38Xqkp 2N3/jqdkR+5ZiKOYhsYj+Iy6U3jyqiEl9VySYTfEIfP/ky1CD0a8/EVC9HR4iG8J im6G7/osaSBYAZctryLqVJXObTelgEy/EFwW9jW8HVph/G+ljmHOmuQ= -----END RSA PRIVATE KEY----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE ca.pem +# @TEST-START-FILE ca.pem -----BEGIN CERTIFICATE----- MIIDmzCCAoOgAwIBAgIJAPLZ3e3WR0LLMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV BAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UEBwwIQmVya2VsZXkxIzAhBgNVBAoM @@ -141,9 +141,9 @@ WmElijr1Tzuzd59rWPqC/tVIsh42vQ+P6g8Y1PDmo8eTUFveZ+wcr/eEPW6IOMrg OW7tATcrgzNuXZ1umiuGgAPuIVqPfr9ssZHBqi9UOK9L/8MQrnOxecNUpPohcTFR vq+Zqu15QV9T4BVWKHv0 -----END CERTIFICATE----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -188,10 +188,10 @@ event pong(msg: string, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -241,4 +241,4 @@ event zeek_done() print get_broker_stats(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_ts_compat.zeek b/testing/btest/broker/remote_event_ts_compat.zeek index f6decf81ac..7c457f9911 100644 --- a/testing/btest/broker/remote_event_ts_compat.zeek +++ b/testing/btest/broker/remote_event_ts_compat.zeek @@ -43,7 +43,7 @@ event my_event(msg: string) &is_used } -@TEST-START-FILE client.py +# @TEST-START-FILE client.py """ Python script sending timestamped and non-timestamped event to TOPIC """ @@ -91,4 +91,4 @@ with broker.Endpoint() as ep, \ ep.shutdown() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_event_vector_any.zeek b/testing/btest/broker/remote_event_vector_any.zeek index 36bc896a59..c7b67f9287 100644 --- a/testing/btest/broker/remote_event_vector_any.zeek +++ b/testing/btest/broker/remote_event_vector_any.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -41,9 +41,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -104,4 +104,4 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_id.zeek b/testing/btest/broker/remote_id.zeek index 676f1cad0f..26bbca2e2d 100644 --- a/testing/btest/broker/remote_id.zeek +++ b/testing/btest/broker/remote_id.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff recv/recv.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek const test_var = "init" &redef; @@ -29,9 +29,9 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) Broker::publish_id("zeek/ids/test", "test_var"); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek const test_var = "init" &redef; @@ -65,4 +65,4 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_log.zeek b/testing/btest/broker/remote_log.zeek index 6158e0572a..9a030b2d9e 100644 --- a/testing/btest/broker/remote_log.zeek +++ b/testing/btest/broker/remote_log.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -37,9 +37,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common @@ -55,9 +55,9 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @@ -97,4 +97,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_log_batch.zeek b/testing/btest/broker/remote_log_batch.zeek index 898968bceb..d0f3b44ce8 100644 --- a/testing/btest/broker/remote_log_batch.zeek +++ b/testing/btest/broker/remote_log_batch.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -42,9 +42,9 @@ event quit() terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common @@ -60,9 +60,9 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load ./common @@ -104,4 +104,4 @@ event Broker::log_flush() Broker::publish("zeek/quit", quit); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_log_late_join.zeek b/testing/btest/broker/remote_log_late_join.zeek index 271c77f71a..bc5660f424 100644 --- a/testing/btest/broker/remote_log_late_join.zeek +++ b/testing/btest/broker/remote_log_late_join.zeek @@ -11,7 +11,7 @@ # @TEST-EXEC: btest-diff send/send.out # @TEST-EXEC: btest-diff send/test.log -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -37,9 +37,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common @@ -55,9 +55,9 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @@ -104,4 +104,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/remote_log_types.zeek b/testing/btest/broker/remote_log_types.zeek index e1ff5f304c..cb4e74251c 100644 --- a/testing/btest/broker/remote_log_types.zeek +++ b/testing/btest/broker/remote_log_types.zeek @@ -14,7 +14,7 @@ # @TEST-EXEC: cat recv/test.log | grep -v '#close' | grep -v '#open' >recv/test.log.filtered # @TEST-EXEC: diff -u send/test.log.filtered recv/test.log.filtered -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; @@ -57,9 +57,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load ./common @@ -74,9 +74,9 @@ event quit_receiver() terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load ./common @@ -133,4 +133,4 @@ event Broker::log_flush() Broker::publish("zeek/", quit_receiver); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/ssl_auth_failure.zeek b/testing/btest/broker/ssl_auth_failure.zeek index 3249d94dbf..a8c2ca951d 100644 --- a/testing/btest/broker/ssl_auth_failure.zeek +++ b/testing/btest/broker/ssl_auth_failure.zeek @@ -16,7 +16,7 @@ # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE ca.pem +# @TEST-START-FILE ca.pem -----BEGIN CERTIFICATE----- MIIDmzCCAoOgAwIBAgIJAPLZ3e3WR0LLMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV BAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UEBwwIQmVya2VsZXkxIzAhBgNVBAoM @@ -39,10 +39,10 @@ WmElijr1Tzuzd59rWPqC/tVIsh42vQ+P6g8Y1PDmo8eTUFveZ+wcr/eEPW6IOMrg OW7tATcrgzNuXZ1umiuGgAPuIVqPfr9ssZHBqi9UOK9L/8MQrnOxecNUpPohcTFR vq+Zqu15QV9T4BVWKHv0 -----END CERTIFICATE----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE cert.1.pem +# @TEST-START-FILE cert.1.pem -----BEGIN CERTIFICATE----- MIIDOjCCAiICCQDz7oMOR7Wm7jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV UzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCEJlcmtlbGV5MSMwIQYDVQQKDBpBQ01F @@ -63,9 +63,9 @@ NosoTmGCV0HecWN4l38ojnXd44aSktQIND9iCLus3S6++nFnX5DHGZiv6/SnSO/6 +Op7nV0A6zKVcMOYQ0SGZPD8UQs5wDJgrR9LY29Ox5QBwu/5NqyvNSrMQaTop5vb wkMInaq5lLxEYQDSLBc= -----END CERTIFICATE----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE key.1.pem +# @TEST-START-FILE key.1.pem -----BEGIN RSA PRIVATE KEY----- MIIEogIBAAKCAQEAx6G3HAEEKm2QDXTncfOdlv51MxnMKbqzovM24fcgsTMJxTKI FvQLKihJ3bMqVegIf3CM+OTwIAnRIPtaXNgxu/hNPkJVeAoTcAg7pPhUlgeqajEw @@ -93,9 +93,9 @@ Dwd/AoGAILn8pVC9dIFac2BDOFU5y9ZvMmZAvwRxh9vEWewNvkzg27vdYc+rCHNm I7H0S/RqfqVeo0ApE5PQ8Sll6RvxN/mbSQo9YeCDGQ1r1rNe4Vs12GAYXAbE4ipf BTdqMbieumB/zL97iK5baHUFEJ4VRtLQhh/SOXgew/BF8ccpilI= -----END RSA PRIVATE KEY----- -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send-check.zeek +# @TEST-START-FILE send-check.zeek # This script just confirms the process running recv.zeek has listen()'d event zeek_init() @@ -108,9 +108,9 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek # This is expected to generate the error condition and be unable to connect # do to SSL authentication failure. @@ -143,9 +143,9 @@ event Broker::error(code: Broker::ErrorCode, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek # No cert here. # @@ -178,4 +178,4 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) print fmt("receiver lost peer: endpoint=%s msg=%s", endpoint$network$address, msg); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-attr-clone.zeek b/testing/btest/broker/store/brokerstore-attr-clone.zeek index 3ced58cca6..78e6fbae76 100644 --- a/testing/btest/broker/store/brokerstore-attr-clone.zeek +++ b/testing/btest/broker/store/brokerstore-attr-clone.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: btest-diff master.out # @TEST-EXEC: btest-diff clonetwo.out -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; global tablestore: opaque of Broker::Store; @@ -36,9 +36,9 @@ event dump_tables() event do_terminate() { terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek event zeek_init() { @@ -84,9 +84,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) if ( peers == 0 ) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE cloneone.zeek +# @TEST-START-FILE cloneone.zeek event zeek_init() { Broker::subscribe("cloneone"); @@ -120,9 +120,9 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) setstore = Broker::create_clone("set"); recordstore = Broker::create_clone("rec"); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clonetwo.zeek +# @TEST-START-FILE clonetwo.zeek event zeek_init() { Broker::subscribe("clonetwo"); @@ -147,4 +147,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) setstore = Broker::create_clone("set"); recordstore = Broker::create_clone("rec"); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-attr-expire.zeek b/testing/btest/broker/store/brokerstore-attr-expire.zeek index 9f5d2a1aff..085dac0749 100644 --- a/testing/btest/broker/store/brokerstore-attr-expire.zeek +++ b/testing/btest/broker/store/brokerstore-attr-expire.zeek @@ -14,7 +14,7 @@ # # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone.out -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; redef table_expire_interval = 0.5sec; @@ -49,9 +49,9 @@ function change_r(tbl: any, tpe: TableChange, idx: string, idxb: testrec) global t: table[string] of count &broker_store="table" &create_expire=4sec &on_change=change_t; global s: table[string] of count &broker_store="set" &write_expire=3sec &on_change=change_s; global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec" &write_expire=5sec &on_change=change_r; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek event zeek_init() { Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -97,9 +97,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) print "Terminating"; terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek event zeek_init() { @@ -139,4 +139,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) recordstore = Broker::create_clone("rec"); schedule 0.1sec { check_all_set() }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek index 8903c5b89a..ef54517a4f 100644 --- a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek +++ b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek @@ -15,7 +15,7 @@ # @TEST-EXEC: diff output1 output2 # @TEST-EXEC: diff output2 output3 -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek global tablestore: opaque of Broker::Store; global setstore: opaque of Broker::Store; global recordstore: opaque of Broker::Store; @@ -29,11 +29,11 @@ type testrec: record { global t: table[string] of count &broker_store="table"; global s: set[string] &broker_store="set"; global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec"; -@TEST-END-FILE +# @TEST-END-FILE # the first test writes out the sqlite files... -@TEST-START-FILE one.zeek +# @TEST-START-FILE one.zeek redef exit_only_after_terminate = T; event zeek_init() @@ -58,8 +58,8 @@ event zeek_init() terminate(); } -@TEST-END-FILE -@TEST-START-FILE two.zeek +# @TEST-END-FILE +# @TEST-START-FILE two.zeek redef exit_only_after_terminate = T; # read in again - and serve to clones @@ -80,9 +80,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE three.zeek +# @TEST-START-FILE three.zeek redef exit_only_after_terminate = T; # get copy from master @@ -117,4 +117,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-attr-persistence.zeek b/testing/btest/broker/store/brokerstore-attr-persistence.zeek index bf7f1296a9..0893e2c4f4 100644 --- a/testing/btest/broker/store/brokerstore-attr-persistence.zeek +++ b/testing/btest/broker/store/brokerstore-attr-persistence.zeek @@ -6,7 +6,7 @@ # the first test writes out the sqlite files... -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek global tablestore: opaque of Broker::Store; global setstore: opaque of Broker::Store; global recordstore: opaque of Broker::Store; @@ -20,9 +20,9 @@ type testrec: record { global t: table[string] of count &broker_store="table"; global s: set[string] &broker_store="set"; global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE one.zeek +# @TEST-START-FILE one.zeek event zeek_init() { @@ -45,8 +45,8 @@ event zeek_init() print sort_table(r); } -@TEST-END-FILE -@TEST-START-FILE two.zeek +# @TEST-END-FILE +# @TEST-START-FILE two.zeek # the second one reads them in again @@ -59,4 +59,4 @@ event zeek_init() print sort_set(s); print sort_table(r); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-attr-simple.zeek b/testing/btest/broker/store/brokerstore-attr-simple.zeek index dcaac9c3b4..8da8a7769f 100644 --- a/testing/btest/broker/store/brokerstore-attr-simple.zeek +++ b/testing/btest/broker/store/brokerstore-attr-simple.zeek @@ -6,7 +6,7 @@ # # @TEST-EXEC: btest-diff clone.out -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek redef exit_only_after_terminate = T; global tablestore: opaque of Broker::Store; @@ -22,9 +22,9 @@ type testrec: record { global t: table[string] of count &broker_store="table"; global s: set[string, string] &broker_store="set"; global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek event zeek_init() { tablestore = Broker::create_master("table"); @@ -64,9 +64,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek event zeek_init() { Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -96,4 +96,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) recordstore = Broker::create_clone("rec"); schedule 0.1sec { check_all_set() }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek b/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek index f863dc8ef3..596f7d9154 100644 --- a/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek +++ b/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek @@ -11,12 +11,12 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE function change_handler(t: table[string, count] of count, tpe: TableChange, k0: string, k1: count, v: count) diff --git a/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek b/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek index c69ce82425..fe5dae8e49 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek @@ -10,16 +10,16 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-sort" btest-diff worker-1/err.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-sort" btest-diff worker-2/err.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek @load base/frameworks/cluster redef exit_only_after_terminate = T; @@ -52,9 +52,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek @load base/frameworks/cluster @load base/frameworks/reporter redef exit_only_after_terminate = T; @@ -78,4 +78,4 @@ event reporter_error(t: time, msg: string, location: string) if ( errors == 2 ) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek b/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek index ee126f0a64..13e490eebc 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek @@ -12,15 +12,15 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek @load base/frameworks/cluster redef exit_only_after_terminate = T; @@ -47,9 +47,9 @@ function all_stores_set(): bool { return "whatever" in t && "hi" in s && "b" in r; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) &priority=1 { @@ -66,9 +66,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek global has_node_up: bool = F; global has_announce_masters: bool = F; @@ -115,9 +115,9 @@ event Broker::announce_masters(masters: set[string]) if ( has_node_up ) event dump_tables(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone2.zeek +# @TEST-START-FILE clone2.zeek event dump_tables() { print sort_table(t); @@ -145,5 +145,5 @@ event Cluster::node_up(name: string, id: string) Reporter::info(fmt("Node Up: %s", name)); schedule 0.1sec { check_all_set() }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-backend-simple.zeek b/testing/btest/broker/store/brokerstore-backend-simple.zeek index 45c01866c1..f2e5edbf4a 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple.zeek @@ -12,15 +12,15 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek @load base/frameworks/cluster @load base/frameworks/broker @@ -38,9 +38,9 @@ global t: table[string] of count &backend=Broker::MEMORY; global s: set[string] &backend=Broker::MEMORY; global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek event zeek_init() { t["a"] = 5; @@ -69,9 +69,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek event dump_tables() { @@ -94,4 +94,4 @@ event Cluster::node_up(name: string, id: string) { schedule 0.1sec { check_all_set() }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-backend-sqlite-incompatible.zeek b/testing/btest/broker/store/brokerstore-backend-sqlite-incompatible.zeek index 5b97a2a444..5f5c55036e 100644 --- a/testing/btest/broker/store/brokerstore-backend-sqlite-incompatible.zeek +++ b/testing/btest/broker/store/brokerstore-backend-sqlite-incompatible.zeek @@ -7,7 +7,7 @@ # the first test writes out the sqlite files... -@TEST-START-FILE one.zeek +# @TEST-START-FILE one.zeek module TestModule; @@ -21,8 +21,8 @@ event zeek_init() print t; } -@TEST-END-FILE -@TEST-START-FILE two.zeek +# @TEST-END-FILE +# @TEST-START-FILE two.zeek # the second one reads them in again. Or not because the types are incompatible. @@ -35,4 +35,4 @@ event zeek_init() { print t; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/brokerstore-backend-sqlite.zeek b/testing/btest/broker/store/brokerstore-backend-sqlite.zeek index c58c1831cd..dc06438a55 100644 --- a/testing/btest/broker/store/brokerstore-backend-sqlite.zeek +++ b/testing/btest/broker/store/brokerstore-backend-sqlite.zeek @@ -13,23 +13,23 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek type testrec: record { a: count; b: string; c: set[string]; }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE preseed-sqlite.zeek +# @TEST-START-FILE preseed-sqlite.zeek global t: table[string] of count &backend=Broker::SQLITE; global s: set[string] &backend=Broker::SQLITE; global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::SQLITE; @@ -59,9 +59,9 @@ event zeek_init() print rt; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE master.zeek +# @TEST-START-FILE master.zeek @load base/frameworks/cluster redef exit_only_after_terminate = T; @@ -98,9 +98,9 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone.zeek +# @TEST-START-FILE clone.zeek @load base/frameworks/cluster redef exit_only_after_terminate = T; @@ -140,4 +140,4 @@ event Cluster::node_up(name: string, id: string) { schedule 0.1sec { check_all_set() }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/store/clone.zeek b/testing/btest/broker/store/clone.zeek index b53b17e303..2989d227dd 100644 --- a/testing/btest/broker/store/clone.zeek +++ b/testing/btest/broker/store/clone.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff clone/clone.out # @TEST-EXEC: btest-diff master/master.out -@TEST-START-FILE master-main.zeek +# @TEST-START-FILE master-main.zeek redef exit_only_after_terminate = T; global query_timeout = 1sec; @@ -72,10 +72,10 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) schedule 4secs { insert_more() }; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE clone-main.zeek +# @TEST-START-FILE clone-main.zeek redef exit_only_after_terminate = T; @@ -145,4 +145,4 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) schedule 2secs { lookup(1) }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/unpeer.zeek b/testing/btest/broker/unpeer.zeek index eee693d9d9..ba6ce1d42a 100644 --- a/testing/btest/broker/unpeer.zeek +++ b/testing/btest/broker/unpeer.zeek @@ -14,7 +14,7 @@ # @TEST-EXEC: btest-diff recv/broker.filtered.log # @TEST-EXEC: btest-diff send/broker.filtered.log -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -51,10 +51,10 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -76,4 +76,4 @@ event zeek_init() } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/web-socket-events-metadata.zeek b/testing/btest/broker/web-socket-events-metadata.zeek index 33477b4e7e..34ab366061 100644 --- a/testing/btest/broker/web-socket-events-metadata.zeek +++ b/testing/btest/broker/web-socket-events-metadata.zeek @@ -61,7 +61,7 @@ event pong(msg: string, n: count) &is_used } -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import asyncio, datetime, websockets, os, time, json, sys ws_port = os.environ['BROKER_PORT'].split('/')[0] @@ -149,4 +149,4 @@ async def do_run(): loop = asyncio.get_event_loop() loop.run_until_complete(do_run()) -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/broker/web-socket-events.zeek b/testing/btest/broker/web-socket-events.zeek index 9002b803b4..ca59759ca3 100644 --- a/testing/btest/broker/web-socket-events.zeek +++ b/testing/btest/broker/web-socket-events.zeek @@ -52,7 +52,7 @@ event pong(msg: string, n: count) &is_used } -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import asyncio, websockets, os, time, json, sys ws_port = os.environ['BROKER_PORT'].split('/')[0] @@ -125,4 +125,4 @@ async def do_run(): loop = asyncio.get_event_loop() loop.run_until_complete(do_run()) -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/broker/cluster-publish.zeek b/testing/btest/cluster/broker/cluster-publish.zeek index b96c984e6a..45800292e7 100644 --- a/testing/btest/cluster/broker/cluster-publish.zeek +++ b/testing/btest/cluster/broker/cluster-publish.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; redef exit_only_after_terminate = T; @@ -56,10 +56,10 @@ event pong(msg: string, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; redef exit_only_after_terminate = T; @@ -103,4 +103,4 @@ event ping(msg: string, n: count) Cluster::publish("zeek/event/my_topic", pong, msg, n); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/broker/publish-any.zeek b/testing/btest/cluster/broker/publish-any.zeek index 6f113bb957..6271548116 100644 --- a/testing/btest/cluster/broker/publish-any.zeek +++ b/testing/btest/cluster/broker/publish-any.zeek @@ -12,22 +12,22 @@ # @TEST-EXEC: btest-diff ./manager/.stdout # @TEST-EXEC: btest-diff ./worker-1/.stdout -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager"], }; -@TEST-END-FILE +# @TEST-END-FILE -# @TEST-START-FILE common.zeek +# # @TEST-START-FILE common.zeek redef Log::default_rotation_interval = 0sec; global finish: event() &is_used; global ping: event(c: count, what: string, val: any) &is_used; global pong: event(c: count, what: string, val: any) &is_used; -# @TEST-END-FILE +# # @TEST-END-FILE -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./common.zeek global i = 0; @@ -81,10 +81,10 @@ event Cluster::node_down(name: string, id: string) { terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -# @TEST-START-FILE worker.zeek +# # @TEST-START-FILE worker.zeek @load ./common.zeek event ping(c: count, what: string, val: any) @@ -104,4 +104,4 @@ event finish() print "got finish!"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE diff --git a/testing/btest/cluster/generic/logging-rr.zeek b/testing/btest/cluster/generic/logging-rr.zeek index 5ce5279367..3af8d1d310 100644 --- a/testing/btest/cluster/generic/logging-rr.zeek +++ b/testing/btest/cluster/generic/logging-rr.zeek @@ -32,7 +32,7 @@ # @TEST-EXEC: sort -n rr2.log > rr2.log.sorted # @TEST-EXEC: btest-diff rr2.log.sorted -# @TEST-START-FILE common.zeek +# # @TEST-START-FILE common.zeek @load ./zeromq-test-bootstrap.zeek redef Log::default_rotation_interval = 0sec; @@ -62,9 +62,9 @@ event finish() { terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./common.zeek event check_ready() @@ -103,10 +103,10 @@ event Cluster::node_down(name: string, id: string) if ( |nodes_down| == 4 ) # both loggers down terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -# @TEST-START-FILE worker.zeek +# # @TEST-START-FILE worker.zeek @load ./common.zeek global do_write2 = F; @@ -147,9 +147,9 @@ event zeek_init() event write_log1(0); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE check-log.sh +# @TEST-START-FILE check-log.sh #!/usr/bin/env bash # # This script regularly checks for the loggers rr1.log file until @@ -174,4 +174,4 @@ done echo "DONE" echo "DONE" > DONE exit 0 -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/bad-event-args.zeek b/testing/btest/cluster/websocket/bad-event-args.zeek index 01aabb7808..17c3065d89 100644 --- a/testing/btest/cluster/websocket/bad-event-args.zeek +++ b/testing/btest/cluster/websocket/bad-event-args.zeek @@ -25,7 +25,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -55,10 +55,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) print "Cluster::websocket_client_lost"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -123,4 +123,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/bad-subscriptions.zeek b/testing/btest/cluster/websocket/bad-subscriptions.zeek index f6acb33aab..81b9ec3743 100644 --- a/testing/btest/cluster/websocket/bad-subscriptions.zeek +++ b/testing/btest/cluster/websocket/bad-subscriptions.zeek @@ -25,7 +25,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -56,10 +56,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) if ( lost == 4 ) terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -99,4 +99,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/bad-url.zeek b/testing/btest/cluster/websocket/bad-url.zeek index 6bc6f9b185..d70acf751a 100644 --- a/testing/btest/cluster/websocket/bad-url.zeek +++ b/testing/btest/cluster/websocket/bad-url.zeek @@ -25,7 +25,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -58,10 +58,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) print "Cluster::websocket_client_lost"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time import websockets.exceptions from websockets.sync.client import connect @@ -98,4 +98,4 @@ def main(): if __name__ == '__main__': main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/cluster-log.zeek b/testing/btest/cluster/websocket/cluster-log.zeek index e8e6c6f001..5770543b85 100644 --- a/testing/btest/cluster/websocket/cluster-log.zeek +++ b/testing/btest/cluster/websocket/cluster-log.zeek @@ -27,7 +27,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -70,10 +70,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) if ( lost == 3 ) terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -108,4 +108,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/one-pipelining.zeek b/testing/btest/cluster/websocket/one-pipelining.zeek index 3bf6096ee5..6253e07b00 100644 --- a/testing/btest/cluster/websocket/one-pipelining.zeek +++ b/testing/btest/cluster/websocket/one-pipelining.zeek @@ -25,7 +25,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -58,10 +58,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) print "Cluster::websocket_client_lost"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -120,4 +120,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/one.zeek b/testing/btest/cluster/websocket/one.zeek index e3ecf77d4f..1f2ba6919a 100644 --- a/testing/btest/cluster/websocket/one.zeek +++ b/testing/btest/cluster/websocket/one.zeek @@ -25,7 +25,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -58,10 +58,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) print "Cluster::websocket_client_lost"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -117,4 +117,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/three.zeek b/testing/btest/cluster/websocket/three.zeek index ca6f998be9..ab8d68aaa2 100644 --- a/testing/btest/cluster/websocket/three.zeek +++ b/testing/btest/cluster/websocket/three.zeek @@ -26,7 +26,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -74,10 +74,10 @@ event zeek_init() Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]); Cluster::subscribe("/test/manager"); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -146,4 +146,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/tls.zeek b/testing/btest/cluster/websocket/tls.zeek index 171dc6f5c2..73b3be5572 100644 --- a/testing/btest/cluster/websocket/tls.zeek +++ b/testing/btest/cluster/websocket/tls.zeek @@ -27,7 +27,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -72,10 +72,10 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) print "Cluster::websocket_client_lost"; terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import asyncio, json, os, socket, time from websockets.asyncio.client import connect @@ -135,17 +135,17 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE # The cert and key were generated with OpenSSL using the following command, # taken from https://letsencrypt.org/docs/certificates-for-localhost/ # # The test will generate the script, but the certificate is valid # for 10 years. -@TEST-START-FILE gen-localhost-certs.sh +# @TEST-START-FILE gen-localhost-certs.sh #!/usr/bin/env bash openssl req -x509 -out localhost.crt -keyout localhost.key \ -newkey rsa:2048 -nodes -sha256 -days 3650 \ -subj '/CN=localhost' -extensions EXT -config <( \ printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nbasicConstraints=CA:TRUE") -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/two-pipelining.zeek b/testing/btest/cluster/websocket/two-pipelining.zeek index 92ec628c7b..4f3b54e900 100644 --- a/testing/btest/cluster/websocket/two-pipelining.zeek +++ b/testing/btest/cluster/websocket/two-pipelining.zeek @@ -26,7 +26,7 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./zeromq-test-bootstrap redef exit_only_after_terminate = T; @@ -106,10 +106,10 @@ event zeek_init() Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]); Cluster::subscribe("/test/manager"); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -176,4 +176,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/zeromq.zeek b/testing/btest/cluster/websocket/zeromq.zeek index f49942703f..23f32ab351 100644 --- a/testing/btest/cluster/websocket/zeromq.zeek +++ b/testing/btest/cluster/websocket/zeromq.zeek @@ -25,15 +25,15 @@ # @TEST-EXEC: btest-diff ./client/out # @TEST-EXEC: btest-diff ./client/.stderr -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek @load ./zeromq-test-bootstrap global ping: event(msg: string, c: count) &is_used; global pong: event(msg: string, c: count) &is_used; -@TEST-END-FILE +# @TEST-END-FILE -# @TEST-START-FILE manager.zeek +# # @TEST-START-FILE manager.zeek @load ./common.zeek redef Log::enable_local_logging = T; @@ -84,9 +84,9 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) if ( lost == 3 ) terminate(); } -# @TEST-END-FILE +# # @TEST-END-FILE -# @TEST-START-FILE worker.zeek +# # @TEST-START-FILE worker.zeek @load ./common.zeek event zeek_init() @@ -109,10 +109,10 @@ event ping(msg: string, n: count) { print fmt("got ping: %s, %s", msg, n); } -# @TEST-END-FILE +# # @TEST-END-FILE -@TEST-START-FILE client.py +# @TEST-START-FILE client.py import json, os, time from websockets.sync.client import connect @@ -175,4 +175,4 @@ def main(): if __name__ == "__main__": main() -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/dict-iteration-expire4.zeek b/testing/btest/core/dict-iteration-expire4.zeek index e23d176e06..5d211d0187 100644 --- a/testing/btest/core/dict-iteration-expire4.zeek +++ b/testing/btest/core/dict-iteration-expire4.zeek @@ -59,7 +59,7 @@ event zeek_init() { tbl[k] = k; } -@TEST-START-FILE 1.seeds +# @TEST-START-FILE 1.seeds 3569182667 3864322632 2737717875 @@ -81,9 +81,9 @@ event zeek_init() { 3834222442 2355333979 113403102 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE 2.seeds +# @TEST-START-FILE 2.seeds 4013930712 1835775324 3393047106 @@ -105,4 +105,4 @@ event zeek_init() { 348858887 14638654 4267481449 -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/dict-iteration-expire5.zeek b/testing/btest/core/dict-iteration-expire5.zeek index 49fd3513de..4a3feb2396 100644 --- a/testing/btest/core/dict-iteration-expire5.zeek +++ b/testing/btest/core/dict-iteration-expire5.zeek @@ -18,7 +18,7 @@ event new_connection(c: connection) { recent_conns[c$id] = c$uid; } -@TEST-START-FILE 1.seeds +# @TEST-START-FILE 1.seeds 3569182667 3864322632 2737717875 @@ -40,9 +40,9 @@ event new_connection(c: connection) { 3834222442 2355333979 113403102 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE 2.seeds +# @TEST-START-FILE 2.seeds 4013930712 1835775324 3393047106 @@ -64,4 +64,4 @@ event new_connection(c: connection) { 348858887 14638654 4267481449 -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/discarder.zeek b/testing/btest/core/discarder.zeek index 21bae33541..0494b89750 100644 --- a/testing/btest/core/discarder.zeek +++ b/testing/btest/core/discarder.zeek @@ -4,7 +4,7 @@ # @TEST-EXEC: zeek -b -C -r $TRACES/icmp/icmp-destunreach-udp.pcap discarder-icmp.zeek >>output # @TEST-EXEC: btest-diff output -@TEST-START-FILE discarder-ip.zeek +# @TEST-START-FILE discarder-ip.zeek event zeek_init() { @@ -24,9 +24,9 @@ event new_packet(c: connection, p: pkt_hdr) print c$id; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE discarder-tcp.zeek +# @TEST-START-FILE discarder-tcp.zeek event zeek_init() { @@ -46,9 +46,9 @@ event new_packet(c: connection, p: pkt_hdr) print c$id; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE discarder-udp.zeek +# @TEST-START-FILE discarder-udp.zeek event zeek_init() { @@ -68,9 +68,9 @@ event new_packet(c: connection, p: pkt_hdr) print c$id; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE discarder-icmp.zeek +# @TEST-START-FILE discarder-icmp.zeek event zeek_init() { @@ -89,4 +89,4 @@ event new_packet(c: connection, p: pkt_hdr) print c$id; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/event-groups/errors.zeek b/testing/btest/core/event-groups/errors.zeek index b8aa36461a..f45251618b 100644 --- a/testing/btest/core/event-groups/errors.zeek +++ b/testing/btest/core/event-groups/errors.zeek @@ -7,21 +7,21 @@ event zeek_init() print "enable non existing event group", r; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local r = disable_event_group("my-group"); print "disable non existing event group", r; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local r = enable_module_events("MyModule"); print "enabling non existing module event group", r; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local r = disable_module_events("MyModule"); diff --git a/testing/btest/core/file-analyzer-violation.zeek b/testing/btest/core/file-analyzer-violation.zeek index 70757bc8d2..ca1646d47e 100644 --- a/testing/btest/core/file-analyzer-violation.zeek +++ b/testing/btest/core/file-analyzer-violation.zeek @@ -33,6 +33,6 @@ event zeek_init() # This file triggers a binpac exception for PE that is reported through # analyzer_violation_info -@TEST-START-FILE ./myfile.exe +# @TEST-START-FILE ./myfile.exe MZ0000000000000000000000000000000000000000000000000000000000000 -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/load-file-extension.zeek b/testing/btest/core/load-file-extension.zeek index 42449da455..47fa6d6681 100644 --- a/testing/btest/core/load-file-extension.zeek +++ b/testing/btest/core/load-file-extension.zeek @@ -28,31 +28,31 @@ # @TEST-EXEC-FAIL: zeek -b load_foo # @TEST-EXEC: rm foo.xyz -@TEST-START-FILE load_foo +# @TEST-START-FILE load_foo @load foo -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE load_foo_xyz +# @TEST-START-FILE load_foo_xyz @load foo.xyz -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE x/foo.zeek +# @TEST-START-FILE x/foo.zeek print "Zeek script loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE x/foo.xyz +# @TEST-START-FILE x/foo.xyz print "Non-standard file extension script loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE x/foo/__load__.zeek +# @TEST-START-FILE x/foo/__load__.zeek @load ./main -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE x/foo/main.zeek +# @TEST-START-FILE x/foo/main.zeek print "Script package loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE x2/foo +# @TEST-START-FILE x2/foo print "No file extension script loaded"; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/load-pkg.zeek b/testing/btest/core/load-pkg.zeek index 59cb87c2fa..a358c24faf 100644 --- a/testing/btest/core/load-pkg.zeek +++ b/testing/btest/core/load-pkg.zeek @@ -8,11 +8,11 @@ # @TEST-EXEC: rm foo/__load__.zeek # @TEST-EXEC-FAIL: zeek -b foo -@TEST-START-FILE foo/__load__.zeek +# @TEST-START-FILE foo/__load__.zeek @load ./test print "__load__.zeek loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE foo/test.zeek +# @TEST-START-FILE foo/test.zeek print "test.zeek loaded"; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/load-prefixes.zeek b/testing/btest/core/load-prefixes.zeek index ae16965a87..d02b422cfc 100644 --- a/testing/btest/core/load-prefixes.zeek +++ b/testing/btest/core/load-prefixes.zeek @@ -3,22 +3,22 @@ # @TEST-EXEC: zeek -b base/utils/site base/protocols/http addprefixes >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE addprefixes.zeek +# @TEST-START-FILE addprefixes.zeek @prefixes += lcl @prefixes += lcl2 -@TEST-END-FILE +# @TEST-END-FILE # Since base/utils/site.zeek is a script, only a script with the original file # extension can be loaded here. -@TEST-START-FILE lcl.base.utils.site.zeek +# @TEST-START-FILE lcl.base.utils.site.zeek print "loaded lcl.base.utils.site.zeek"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE lcl2.base.utils.site.zeek +# @TEST-START-FILE lcl2.base.utils.site.zeek print "loaded lcl2.base.utils.site.zeek"; -@TEST-END-FILE +# @TEST-END-FILE # For a script package like base/protocols/http/, verify the package can be loaded. -@TEST-START-FILE lcl.base.protocols.http.zeek +# @TEST-START-FILE lcl.base.protocols.http.zeek print "loaded lcl.base.protocols.http.zeek"; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/load-relative.zeek b/testing/btest/core/load-relative.zeek index 8e1e6f8a06..22ea1b48a9 100644 --- a/testing/btest/core/load-relative.zeek +++ b/testing/btest/core/load-relative.zeek @@ -3,16 +3,16 @@ # @TEST-EXEC: zeek -b foo/foo >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE foo/foo.zeek +# @TEST-START-FILE foo/foo.zeek @load ./bar @load ../baz print "foo loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE foo/bar.zeek +# @TEST-START-FILE foo/bar.zeek print "bar loaded"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE baz.zeek +# @TEST-START-FILE baz.zeek print "baz loaded"; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/load-unload.zeek b/testing/btest/core/load-unload.zeek index 3079939b5e..3ae6052665 100644 --- a/testing/btest/core/load-unload.zeek +++ b/testing/btest/core/load-unload.zeek @@ -4,15 +4,15 @@ # @TEST-EXEC: btest-diff output # @TEST-EXEC: grep dontloadme loaded_scripts.log && exit 1 || exit 0 -@TEST-START-FILE unload.zeek +# @TEST-START-FILE unload.zeek @unload dontloadme @unload pkg-dontloadme -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dontloadme.zeek +# @TEST-START-FILE dontloadme.zeek print "Loaded: dontloadme.zeek"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE pkg-dontloadme/__load__.zeek +# @TEST-START-FILE pkg-dontloadme/__load__.zeek print "Loaded: pkg-dontloadme/__load__.zeek"; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/network_time/broker.zeek b/testing/btest/core/network_time/broker.zeek index 7ec26a7a03..d68b7424e9 100644 --- a/testing/btest/core/network_time/broker.zeek +++ b/testing/btest/core/network_time/broker.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff worker/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff manager/.stdout -@TEST-START-FILE worker.zeek +# @TEST-START-FILE worker.zeek redef allow_network_time_forward = F; @@ -65,10 +65,10 @@ event zeek_done() { print network_time(), "zeek_done"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE manager.zeek +# @TEST-START-FILE manager.zeek # The manager waits for a peer to appear, then starts sending timer # ticks until the peer is gone again. global timer_tick: event(ts: time); @@ -100,4 +100,4 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) print "manager: peer lost, terminating"; terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/option-errors.zeek b/testing/btest/core/option-errors.zeek index 946547be06..36655f07f9 100644 --- a/testing/btest/core/option-errors.zeek +++ b/testing/btest/core/option-errors.zeek @@ -3,11 +3,11 @@ option testbool; -@TEST-START-NEXT +# @TEST-START-NEXT option testbool : bool; -@TEST-START-NEXT +# @TEST-START-NEXT option testopt = 5; testopt = 6; diff --git a/testing/btest/core/option-runtime-errors.zeek b/testing/btest/core/option-runtime-errors.zeek index c21ff5ba1a..18cf351de8 100644 --- a/testing/btest/core/option-runtime-errors.zeek +++ b/testing/btest/core/option-runtime-errors.zeek @@ -8,17 +8,17 @@ option A = 5; Option::set("B", 6); -@TEST-START-NEXT +# @TEST-START-NEXT option A = 5; Option::set("A", "hi"); -@TEST-START-NEXT +# @TEST-START-NEXT const A = 5; Option::set("A", 6); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A = 5; @@ -27,7 +27,7 @@ function option_changed(ID: string, new_value: bool): bool { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A = 5; @@ -36,7 +36,7 @@ function option_changed(ID: string): bool { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; @@ -45,7 +45,7 @@ function option_changed(ID: string, new_value: count): bool { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; @@ -54,7 +54,7 @@ hook option_changed(ID: string, new_value: count) { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; @@ -63,7 +63,7 @@ event option_changed(ID: string, new_value: count) { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: function option_changed(ID: string, new_value: count) : count { } @@ -71,7 +71,7 @@ function option_changed(ID: string, new_value: count) : count { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: const A : count = 5; @@ -80,13 +80,13 @@ function option_changed(ID: string, new_value: count) : count { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; Option::set_change_handler("A", A); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; @@ -95,7 +95,7 @@ function option_changed(ID: string, new_value: count, location: count) : count { Option::set_change_handler("A", option_changed); -@TEST-START-NEXT: +# @TEST-START-NEXT: option A : count = 5; diff --git a/testing/btest/core/parse-only-signature-file-issues.zeek b/testing/btest/core/parse-only-signature-file-issues.zeek index 8a9785ec1f..91f5bdd17c 100644 --- a/testing/btest/core/parse-only-signature-file-issues.zeek +++ b/testing/btest/core/parse-only-signature-file-issues.zeek @@ -6,10 +6,10 @@ # @TEST-EXEC-FAIL: zeek -b -a test.zeek >invalid-sig-file 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff invalid-sig-file -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek @load-sigs test.sig -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig invalid -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/pcap/wrong-format.zeek b/testing/btest/core/pcap/wrong-format.zeek index c480dc1f92..1335e97e7f 100644 --- a/testing/btest/core/pcap/wrong-format.zeek +++ b/testing/btest/core/pcap/wrong-format.zeek @@ -4,7 +4,7 @@ # @TEST-EXEC-FAIL: cat not-a.pcap | zeek -b -r - >output2 2>&1 # @TEST-EXEC: btest-diff output2 -@TEST-START-FILE ./not-a.pcap +# @TEST-START-FILE ./not-a.pcap %PDF-1.5 This isn't an actual pdf file, and neither a PCAP. -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/record-field-redef-errors.zeek b/testing/btest/core/record-field-redef-errors.zeek index a5e8d3148c..449b4bbb40 100644 --- a/testing/btest/core/record-field-redef-errors.zeek +++ b/testing/btest/core/record-field-redef-errors.zeek @@ -5,47 +5,47 @@ # Bad syntax redef record M::Info$ts -= &log; -@TEST-START-NEXT +# @TEST-START-NEXT # Really bad syntax redef record M::Info$ts -= { &log; -@TEST-START-NEXT +# @TEST-START-NEXT # Not the right syntax redef record M::Info$ts -= [ &log ]; -@TEST-START-NEXT +# @TEST-START-NEXT # Can not make something optional redef record M::Info$ts += { &optional }; -@TEST-START-NEXT +# @TEST-START-NEXT # Can not add &default redef record M::Info$addl += { &log &default="default"}; -@TEST-START-NEXT +# @TEST-START-NEXT # Can not remove optional redef record M::Info$msg -= { &log &optional }; -@TEST-START-NEXT +# @TEST-START-NEXT # Not a record redef record M::ErrCode$msg += { &log }; -@TEST-START-NEXT +# @TEST-START-NEXT redef record M::Unknown$ts += { &log }; -@TEST-START-NEXT +# @TEST-START-NEXT redef record M::Unknown$ts -= { &log }; -@TEST-START-NEXT +# @TEST-START-NEXT redef record M::Info$no_such_field += { &log }; -@TEST-START-NEXT +# @TEST-START-NEXT redef record M::Info$no_such_field -= { &log }; -@TEST-START-NEXT +# @TEST-START-NEXT # This isn't reported very nicely: It's a syntax error rather than an unknown attribute redef record M::Info$ts += { &unknown }; -# @TEST-START-FILE setup.zeek +# # @TEST-START-FILE setup.zeek module M; export { type ErrCode: enum { diff --git a/testing/btest/core/reporter-paths.zeek b/testing/btest/core/reporter-paths.zeek index b38ff05831..03e07a81ec 100644 --- a/testing/btest/core/reporter-paths.zeek +++ b/testing/btest/core/reporter-paths.zeek @@ -16,6 +16,6 @@ # # @TEST-EXEC: btest-diff output -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek event idontexist() { } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/suspend_processing/broker.zeek b/testing/btest/core/suspend_processing/broker.zeek index 0c9aaa3eb8..b4d28dc9c4 100644 --- a/testing/btest/core/suspend_processing/broker.zeek +++ b/testing/btest/core/suspend_processing/broker.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff worker/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff manager/.stdout -@TEST-START-FILE worker.zeek +# @TEST-START-FILE worker.zeek event zeek_init() { @@ -58,10 +58,10 @@ event zeek_done() { print network_time(), "zeek_done"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE manager.zeek +# @TEST-START-FILE manager.zeek # The manager waits for a peer and directly publishes do_continue_processing() # to it. It terminates when the peer is lost. global do_continue_processing: event(); @@ -82,4 +82,4 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) print "manager: peer lost, terminating"; terminate(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/core/suspend_processing/config.zeek b/testing/btest/core/suspend_processing/config.zeek index b47a4a1f9f..d04fde47b2 100644 --- a/testing/btest/core/suspend_processing/config.zeek +++ b/testing/btest/core/suspend_processing/config.zeek @@ -5,11 +5,11 @@ @load base/frameworks/intel -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url putty.exe Intel::FILE_NAME source1 SSH utility https://www.putty.org zeek.exe Intel::FILE_NAME source1 A network monitor https://zeek.org -@TEST-END-FILE +# @TEST-END-FILE redef Intel::read_files += { "intel.dat" }; diff --git a/testing/btest/coverage/zeek-profiler-file.zeek b/testing/btest/coverage/zeek-profiler-file.zeek index 05f2845fa5..4e06bd3319 100644 --- a/testing/btest/coverage/zeek-profiler-file.zeek +++ b/testing/btest/coverage/zeek-profiler-file.zeek @@ -12,12 +12,12 @@ # @TEST-EXEC: grep profiling-test cov.txt > step3.out # @TEST-EXEC: btest-diff step3.out -@TEST-START-FILE profiling-test1.zeek +# @TEST-START-FILE profiling-test1.zeek event new_connection(c: connection) { print "new conn"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE profiling-test2.zeek +# @TEST-START-FILE profiling-test2.zeek event new_connection(c: connection) { print "new conn"; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/doc/zeekygen/declaring_script.zeek b/testing/btest/doc/zeekygen/declaring_script.zeek index 74b7d5ae6c..61afb5011e 100644 --- a/testing/btest/doc/zeekygen/declaring_script.zeek +++ b/testing/btest/doc/zeekygen/declaring_script.zeek @@ -32,7 +32,7 @@ event zeek_init() } -@TEST-START-FILE my-module.zeek +# @TEST-START-FILE my-module.zeek module MyModule; export { @@ -42,10 +42,10 @@ export { }; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE redef-it.zeek +# @TEST-START-FILE redef-it.zeek module RedefIt; export { @@ -53,14 +53,14 @@ export { addl: string &log &default="dfl"; }; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE pkg1/__load__.zeek +# @TEST-START-FILE pkg1/__load__.zeek @load ./redef-more.zeek -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE pkg1/redef-more.zeek +# @TEST-START-FILE pkg1/redef-more.zeek module RedefMore; export { @@ -68,4 +68,4 @@ export { more: string &log &default="more"; }; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/doc/zeekygen/enums.zeek b/testing/btest/doc/zeekygen/enums.zeek index 0a2ec645e4..c33deb82e0 100644 --- a/testing/btest/doc/zeekygen/enums.zeek +++ b/testing/btest/doc/zeekygen/enums.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff autogen-reST-enums.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier TestEnum* autogen-reST-enums.rst -@TEST-END-FILE +# @TEST-END-FILE ## There's tons of ways an enum can look... type TestEnum1: enum { diff --git a/testing/btest/doc/zeekygen/example.zeek b/testing/btest/doc/zeekygen/example.zeek index 7956eaf7a6..cf6b0840b2 100644 --- a/testing/btest/doc/zeekygen/example.zeek +++ b/testing/btest/doc/zeekygen/example.zeek @@ -1,8 +1,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: btest-diff example.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config script zeekygen/example.zeek example.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen/example diff --git a/testing/btest/doc/zeekygen/func-params.zeek b/testing/btest/doc/zeekygen/func-params.zeek index ff87ca4d32..95615eb12e 100644 --- a/testing/btest/doc/zeekygen/func-params.zeek +++ b/testing/btest/doc/zeekygen/func-params.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff autogen-reST-func-params.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier test_func_params* autogen-reST-func-params.rst -@TEST-END-FILE +# @TEST-END-FILE ## This is a global function declaration. ## diff --git a/testing/btest/doc/zeekygen/identifier.zeek b/testing/btest/doc/zeekygen/identifier.zeek index 1615921514..22a1a5ccb4 100644 --- a/testing/btest/doc/zeekygen/identifier.zeek +++ b/testing/btest/doc/zeekygen/identifier.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier ZeekygenExample::* test.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen diff --git a/testing/btest/doc/zeekygen/identifier_without_script.zeek b/testing/btest/doc/zeekygen/identifier_without_script.zeek index ff2bf194f1..aa85a79757 100644 --- a/testing/btest/doc/zeekygen/identifier_without_script.zeek +++ b/testing/btest/doc/zeekygen/identifier_without_script.zeek @@ -9,6 +9,6 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier Log::WRITER_ASCII test.rst -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/doc/zeekygen/package.zeek b/testing/btest/doc/zeekygen/package.zeek index eb0f062866..66cbd5a927 100644 --- a/testing/btest/doc/zeekygen/package.zeek +++ b/testing/btest/doc/zeekygen/package.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT # @TEST-EXEC: btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config package zeekygen test.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen diff --git a/testing/btest/doc/zeekygen/package_index.zeek b/testing/btest/doc/zeekygen/package_index.zeek index 3c89d9439f..4c0f760bfc 100644 --- a/testing/btest/doc/zeekygen/package_index.zeek +++ b/testing/btest/doc/zeekygen/package_index.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT # @TEST-EXEC: btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config package_index zeekygen test.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen diff --git a/testing/btest/doc/zeekygen/records.zeek b/testing/btest/doc/zeekygen/records.zeek index 49993385de..c2ad082c35 100644 --- a/testing/btest/doc/zeekygen/records.zeek +++ b/testing/btest/doc/zeekygen/records.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff autogen-reST-records.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier TestRecord* autogen-reST-records.rst -@TEST-END-FILE +# @TEST-END-FILE # undocumented record type TestRecord1: record { diff --git a/testing/btest/doc/zeekygen/script_index.zeek b/testing/btest/doc/zeekygen/script_index.zeek index 08c11239a5..a1469e75da 100644 --- a/testing/btest/doc/zeekygen/script_index.zeek +++ b/testing/btest/doc/zeekygen/script_index.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT # @TEST-EXEC: btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config script_index zeekygen/* test.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen diff --git a/testing/btest/doc/zeekygen/script_summary.zeek b/testing/btest/doc/zeekygen/script_summary.zeek index f696410512..e36168cd8c 100644 --- a/testing/btest/doc/zeekygen/script_summary.zeek +++ b/testing/btest/doc/zeekygen/script_summary.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT # @TEST-EXEC: btest-diff test.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config script_summary zeekygen/example.zeek test.rst -@TEST-END-FILE +# @TEST-END-FILE @load zeekygen diff --git a/testing/btest/doc/zeekygen/type-aliases.zeek b/testing/btest/doc/zeekygen/type-aliases.zeek index a71b37504a..c653cf6624 100644 --- a/testing/btest/doc/zeekygen/type-aliases.zeek +++ b/testing/btest/doc/zeekygen/type-aliases.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff autogen-reST-type-aliases.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier ZeekygenTest::* autogen-reST-type-aliases.rst -@TEST-END-FILE +# @TEST-END-FILE module ZeekygenTest; diff --git a/testing/btest/doc/zeekygen/vectors.zeek b/testing/btest/doc/zeekygen/vectors.zeek index 60c8626b43..d4d5c03597 100644 --- a/testing/btest/doc/zeekygen/vectors.zeek +++ b/testing/btest/doc/zeekygen/vectors.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; zeek -b -X zeekygen.config %INPUT # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff autogen-reST-vectors.rst -@TEST-START-FILE zeekygen.config +# @TEST-START-FILE zeekygen.config identifier test_vector* autogen-reST-vectors.rst -@TEST-END-FILE +# @TEST-END-FILE type TestRecord: record { field1: bool; diff --git a/testing/btest/language/alternate-prototypes-default-args.zeek b/testing/btest/language/alternate-prototypes-default-args.zeek index a7eeafac20..af9b62b5f8 100644 --- a/testing/btest/language/alternate-prototypes-default-args.zeek +++ b/testing/btest/language/alternate-prototypes-default-args.zeek @@ -44,7 +44,7 @@ event zeek_init() event foo("A", "B"); } -@TEST-START-FILE bad.zeek +# @TEST-START-FILE bad.zeek global foo: event(a: string, b: string, c: string &default="C"); global foo: event(c: string, b: string, a: string &default="A"); -@TEST-END-FILE bad.zeek +# @TEST-END-FILE bad.zeek diff --git a/testing/btest/language/alternate-prototypes-deprecated-args.zeek b/testing/btest/language/alternate-prototypes-deprecated-args.zeek index d6c40425eb..fab363bff6 100644 --- a/testing/btest/language/alternate-prototypes-deprecated-args.zeek +++ b/testing/btest/language/alternate-prototypes-deprecated-args.zeek @@ -37,11 +37,11 @@ event zeek_init() event myev("one", "two", "three"); } -@TEST-START-FILE hide.zeek +# @TEST-START-FILE hide.zeek event myev(a: string, c: string) &priority = 7 { local ddd = vector(1,2,3); print "myev (new)", a, c, ddd; print b; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/any-script-func-variadic-errors.zeek b/testing/btest/language/any-script-func-variadic-errors.zeek index 6d1f78ebcb..04503c3ae7 100644 --- a/testing/btest/language/any-script-func-variadic-errors.zeek +++ b/testing/btest/language/any-script-func-variadic-errors.zeek @@ -26,7 +26,7 @@ event zeek_init() &priority=-10 } -@TEST-START-NEXT +# @TEST-START-NEXT # Do not allow to call variadic through a script-level variable. global f: function(x: any); diff --git a/testing/btest/language/assert-error.zeek b/testing/btest/language/assert-error.zeek index 3ae8384e3d..6462280c9a 100644 --- a/testing/btest/language/assert-error.zeek +++ b/testing/btest/language/assert-error.zeek @@ -8,19 +8,19 @@ event zeek_init() assert 1; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { assert T, 1234; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { assert; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { assert T, "extra", "something"; diff --git a/testing/btest/language/assert-hook.zeek b/testing/btest/language/assert-hook.zeek index e43ed368c9..cffa132ada 100644 --- a/testing/btest/language/assert-hook.zeek +++ b/testing/btest/language/assert-hook.zeek @@ -16,7 +16,7 @@ event zeek_init() print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT # Test the backtrace location, also calling break to suppress reporter log. hook assertion_failure(cond: string, msg: string, bt: Backtrace) { @@ -50,7 +50,7 @@ event zeek_init() print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT # Calling terminate() from the assertion hook. redef exit_only_after_terminate = T; @@ -72,7 +72,7 @@ event zeek_done() assert zeek_is_terminating(), "zeek_done() should have zeek terminating"; } -@TEST-START-NEXT +# @TEST-START-NEXT # Calling exit() from the assertion hook. redef exit_only_after_terminate = T; @@ -93,7 +93,7 @@ event zeek_done() assert F, "zeek_done() not executed with exit()"; } -@TEST-START-NEXT +# @TEST-START-NEXT global assertion_failures = 0; global assertions_total = 0; @@ -146,7 +146,7 @@ event zeek_done() print fmt("%d of %d assertions failed", assertion_failures, assertions_total); } -@TEST-START-NEXT +# @TEST-START-NEXT # Evaluating the msg expression can cause errors, see if we deal # with that gracefully. hook assertion_failure(cond: string, msg: string, bt: Backtrace) @@ -174,7 +174,7 @@ event zeek_done() assert 2 + 2 == 5, cat(get_current_packet_header()$ip); } -@TEST-START-NEXT +# @TEST-START-NEXT # Breaking in assertion_result() also suppresses the reporter errors. hook assertion_result(result: bool, cond: string, msg: string, bt: Backtrace) { @@ -196,7 +196,7 @@ event zeek_done() print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT # Ensure cond is only evaluated once. hook assertion_result(result: bool, cond: string, msg: string, bt: Backtrace) { diff --git a/testing/btest/language/assert.zeek b/testing/btest/language/assert.zeek index c79918c353..43b15eb341 100644 --- a/testing/btest/language/assert.zeek +++ b/testing/btest/language/assert.zeek @@ -9,21 +9,21 @@ event zeek_init() print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { assert fmt("%s", 1) == "2", fmt("\"%s\" != \"2\"", 1); print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { assert to_count("42") == 42.5, "always failing"; print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local x = 2; @@ -31,7 +31,7 @@ event zeek_init() print "not reached"; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local tbl: table[string] of string = [ @@ -43,7 +43,7 @@ event zeek_init() assert "ghi" in tbl, cat(tbl); } -@TEST-START-NEXT +# @TEST-START-NEXT type MyRecord: record { a: count; b: count &optional; @@ -56,7 +56,7 @@ event zeek_init() assert r?$b, fmt("r$b is not set in %s", r); } -@TEST-START-NEXT +# @TEST-START-NEXT type MyRecord: record { a: count; b: count &optional; @@ -71,7 +71,7 @@ event zeek_init() assert r?$b, fmt("r$b is not set trying anyway: %s", r$b); } -@TEST-START-NEXT +# @TEST-START-NEXT assert 1 == 1, "always true"; assert 1 == 2, "always false"; print "not reached"; diff --git a/testing/btest/language/at-deprecated.zeek b/testing/btest/language/at-deprecated.zeek index a035f6d24e..4b19e945f6 100644 --- a/testing/btest/language/at-deprecated.zeek +++ b/testing/btest/language/at-deprecated.zeek @@ -1,16 +1,16 @@ # @TEST-EXEC: zeek -b foo # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr -@TEST-START-FILE foo.zeek +# @TEST-START-FILE foo.zeek @deprecated @load bar @load baz -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE bar.zeek +# @TEST-START-FILE bar.zeek @deprecated "Use '@load qux' instead" -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE baz.zeek +# @TEST-START-FILE baz.zeek @deprecated -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/at-dir.zeek b/testing/btest/language/at-dir.zeek index 35f8894caf..8f88ec7dcb 100644 --- a/testing/btest/language/at-dir.zeek +++ b/testing/btest/language/at-dir.zeek @@ -5,6 +5,6 @@ print @DIR; -@TEST-START-FILE pathtest.zeek +# @TEST-START-FILE pathtest.zeek print @DIR; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/at-if-lambda.zeek b/testing/btest/language/at-if-lambda.zeek index 59fe8c942d..a40a716e50 100644 --- a/testing/btest/language/at-if-lambda.zeek +++ b/testing/btest/language/at-if-lambda.zeek @@ -27,7 +27,7 @@ event zeek_init() print type_name(make_epoch_result), type_name(f), type_name(result), result; } -@TEST-START-NEXT +# @TEST-START-NEXT # Place braces differently @load base/misc/version @@ -52,7 +52,7 @@ event zeek_init() print type_name(make_epoch_result), type_name(f), type_name(result), result; } -@TEST-START-NEXT +# @TEST-START-NEXT # This example doesn't make a whole lot of sense, but adding more @ifdef'ery # around lambdas. @@ -81,7 +81,7 @@ event zeek_init() } -@TEST-START-NEXT +# @TEST-START-NEXT # Same as above, but toggle T @load base/utils/numbers diff --git a/testing/btest/language/at-if-reject.zeek b/testing/btest/language/at-if-reject.zeek index 1e4e1b74d9..821adc9ef4 100644 --- a/testing/btest/language/at-if-reject.zeek +++ b/testing/btest/language/at-if-reject.zeek @@ -14,7 +14,7 @@ event zeek_init() print "That's the right branch"; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { if ( F ) @@ -25,7 +25,7 @@ event zeek_init() @endif } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local vec = vector(1, 2, 3); @@ -35,7 +35,7 @@ event zeek_init() @endif } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local i = 10; @@ -45,7 +45,7 @@ event zeek_init() @endif } -@TEST-START-NEXT +# @TEST-START-NEXT global cond = T; event zeek_init() { diff --git a/testing/btest/language/at-ifdef.zeek b/testing/btest/language/at-ifdef.zeek index 78dc6a48f5..7394120c06 100644 --- a/testing/btest/language/at-ifdef.zeek +++ b/testing/btest/language/at-ifdef.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff .stderr -@TEST-START-FILE main.zeek +# @TEST-START-FILE main.zeek function test_case(msg: string, expect: bool) { @@ -69,9 +69,9 @@ event zeek_init() test_case( "@ifdef child variable", xyz == 1 ); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE bar.zeek +# @TEST-START-FILE bar.zeek module Bar; @@ -79,4 +79,4 @@ export { option exists = T; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/at-ifndef.zeek b/testing/btest/language/at-ifndef.zeek index 5debbe765a..c003ff8170 100644 --- a/testing/btest/language/at-ifndef.zeek +++ b/testing/btest/language/at-ifndef.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff .stderr -@TEST-START-FILE main.zeek +# @TEST-START-FILE main.zeek function test_case(msg: string, expect: bool) { @@ -70,9 +70,9 @@ event zeek_init() } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE bar.zeek +# @TEST-START-FILE bar.zeek module Bar; @@ -80,4 +80,4 @@ export { option exists = T; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/blank-expr-errors.zeek b/testing/btest/language/blank-expr-errors.zeek index 6d786bf49f..0b78a28175 100644 --- a/testing/btest/language/blank-expr-errors.zeek +++ b/testing/btest/language/blank-expr-errors.zeek @@ -9,14 +9,14 @@ event zeek_init() print _; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local _ = vector( "1", "2", "3" ); print _; } -@TEST-START-NEXT +# @TEST-START-NEXT # Ensure it does not work in a module, either. module MyModule; event zeek_init() @@ -25,7 +25,7 @@ event zeek_init() print _; } -@TEST-START-NEXT +# @TEST-START-NEXT # Ensure _ can not referenced when it's a const in an export section. # Adding the const _ isn't an error though. module MyModule; @@ -39,7 +39,7 @@ event zeek_init() print MyModule::_; } -@TEST-START-NEXT +# @TEST-START-NEXT # Ensure it does not work in a function. module MyModule; function helper() diff --git a/testing/btest/language/closure-sending-naming.zeek b/testing/btest/language/closure-sending-naming.zeek index e1ff0cdb7e..f977e23e9d 100644 --- a/testing/btest/language/closure-sending-naming.zeek +++ b/testing/btest/language/closure-sending-naming.zeek @@ -14,7 +14,7 @@ # still works), or separately. #### -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; type myfunctype: function(c: count) : function(d: count) : count; @@ -66,9 +66,9 @@ event pong(msg: string, f: myfunctype) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; const events_to_recv = 1; @@ -132,4 +132,4 @@ event ping(msg: string, f: myfunctype) &is_used } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/closure-sending2.zeek b/testing/btest/language/closure-sending2.zeek index a0abf44b6a..6b35402b8f 100644 --- a/testing/btest/language/closure-sending2.zeek +++ b/testing/btest/language/closure-sending2.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; type myfunctype: function(c: count) : function(d: count) : count; @@ -87,9 +87,9 @@ event pong(msg: string, f: myfunctype) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; const events_to_recv = 7; @@ -164,4 +164,4 @@ event ping(msg: string, f: myfunctype) } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/common-mistakes.zeek b/testing/btest/language/common-mistakes.zeek index c518e595e8..4738d60503 100644 --- a/testing/btest/language/common-mistakes.zeek +++ b/testing/btest/language/common-mistakes.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: btest-diff 2.out # @TEST-EXEC: btest-diff 2.err -@TEST-START-FILE 1.zeek +# @TEST-START-FILE 1.zeek type myrec: record { f: string &optional; }; @@ -44,9 +44,9 @@ event zeek_init() &priority=-10 # Reachable print "other zeek_init"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE 2.zeek +# @TEST-START-FILE 2.zeek function foo() { print "in foo"; @@ -71,4 +71,4 @@ event zeek_init() print "zeek_init done"; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/const.zeek b/testing/btest/language/const.zeek index 38aada2029..387f5b329d 100644 --- a/testing/btest/language/const.zeek +++ b/testing/btest/language/const.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff invalid.stderr # @TEST-EXEC: btest-diff invalid.stdout -@TEST-START-FILE valid.zeek +# @TEST-START-FILE valid.zeek # First some simple code that should be valid and error-free. function f(c: count) @@ -38,9 +38,9 @@ event zeek_init() print "baz", baz; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE invalid.zeek +# @TEST-START-FILE invalid.zeek # Now some const assignments that should generate errors at parse-time. const foo = 0 &redef; @@ -76,4 +76,4 @@ event zeek_init() print "foo=foo", foo = foo; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/crlf-parsing.zeek b/testing/btest/language/crlf-parsing.zeek index 213809278a..7cd9c7c245 100644 --- a/testing/btest/language/crlf-parsing.zeek +++ b/testing/btest/language/crlf-parsing.zeek @@ -4,7 +4,7 @@ # Note the test file itself uses CRLFs and .gitattributes has an entry # to ensure preservation of the CRLFs. -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature blah { ip-proto == tcp @@ -12,14 +12,14 @@ signature blah payload /.*/ event "matched" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek event zeek_init() { print "zeek_init"; } -@TEST-END-FILE +# @TEST-END-FILE @load test.zeek @load-sigs test.sig diff --git a/testing/btest/language/deprecated.zeek b/testing/btest/language/deprecated.zeek index 7b4e1f11ae..be71eeb57f 100644 --- a/testing/btest/language/deprecated.zeek +++ b/testing/btest/language/deprecated.zeek @@ -4,7 +4,7 @@ # @TEST-EXEC: zeek -b warnings.zeek >warnings.out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff warnings.out -@TEST-START-FILE no-warnings.zeek +# @TEST-START-FILE no-warnings.zeek type blah: string &deprecated; global my_event: event(arg: string) &deprecated; @@ -82,9 +82,9 @@ function dont_use_me_either() &deprecated { dont_use_me_either(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE warnings.zeek +# @TEST-START-FILE warnings.zeek type blah: string &deprecated="type warning"; global my_event: event(arg: string) &deprecated="event warning"; @@ -162,4 +162,4 @@ function dont_use_me_either() &deprecated="function warning" { dont_use_me_either(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/eof-parse-errors.zeek b/testing/btest/language/eof-parse-errors.zeek index 54fe96df19..19cf552dc3 100644 --- a/testing/btest/language/eof-parse-errors.zeek +++ b/testing/btest/language/eof-parse-errors.zeek @@ -3,19 +3,19 @@ # @TEST-EXEC: btest-diff output1 # @TEST-EXEC: btest-diff output2 -@TEST-START-FILE a.zeek +# @TEST-START-FILE a.zeek module A; event zeek_init() { print "a"; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE b.zeek +# @TEST-START-FILE b.zeek module B; event zeek_init() { print "b"; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/function-sending.zeek b/testing/btest/language/function-sending.zeek index 71a6463775..478a651240 100644 --- a/testing/btest/language/function-sending.zeek +++ b/testing/btest/language/function-sending.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; global event_count = 0; @@ -45,9 +45,9 @@ event pong(msg: string, f: myfunctype) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; const events_to_recv = 5; @@ -85,4 +85,4 @@ event ping(msg: string, f: myfunctype) } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/global-colon-colon-errors.zeek b/testing/btest/language/global-colon-colon-errors.zeek index c795cf7e44..afd7fe1308 100644 --- a/testing/btest/language/global-colon-colon-errors.zeek +++ b/testing/btest/language/global-colon-colon-errors.zeek @@ -7,12 +7,12 @@ event zeek_init() local ::a = 1; } -@TEST-START-NEXT +# @TEST-START-NEXT # Do not allow :: prefix for an identifier containing a module. hook ::Analyzer::disabling_analyzer(c: connection, atype: AllAnalyzers::Tag, aid: count) { } -@TEST-START-NEXT +# @TEST-START-NEXT # Do not allow exporting names with :: module MyModule; @@ -21,18 +21,18 @@ export { global ::h: hook(); } -@TEST-START-NEXT +# @TEST-START-NEXT # Do not allow :: prefix on parameter names. function f(::a: string) { } -@TEST-START-NEXT +# @TEST-START-NEXT # Non-existing global identifier. event zeek_init() { print ::missing; } -@TEST-START-NEXT +# @TEST-START-NEXT module MyModule; diff --git a/testing/btest/language/hook_calls.zeek b/testing/btest/language/hook_calls.zeek index 89ba9bc4cc..1560bad698 100644 --- a/testing/btest/language/hook_calls.zeek +++ b/testing/btest/language/hook_calls.zeek @@ -5,7 +5,7 @@ # hook functions must be called using the "hook" keyword as an operator... -@TEST-START-FILE valid.zeek +# @TEST-START-FILE valid.zeek hook myhook(i: count) { print "myhook()", i; @@ -57,9 +57,9 @@ event zeek_init() print hook t[0](3); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE invalid.zeek +# @TEST-START-FILE invalid.zeek hook myhook(i: count) { print "myhook()", i; @@ -85,4 +85,4 @@ event zeek_init() print "done"; hook foo(); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/nested-sets.zeek b/testing/btest/language/nested-sets.zeek index 35d2275a61..ada48bd083 100644 --- a/testing/btest/language/nested-sets.zeek +++ b/testing/btest/language/nested-sets.zeek @@ -1,6 +1,6 @@ # @TEST-EXEC: test `zeek -b -G random.seed %INPUT` = "pass" -@TEST-START-FILE random.seed +# @TEST-START-FILE random.seed 0 0 0 @@ -22,7 +22,7 @@ 0 0 0 -@TEST-END-FILE +# @TEST-END-FILE type r: record { b: set[count]; diff --git a/testing/btest/language/next-break-context-errors.zeek b/testing/btest/language/next-break-context-errors.zeek index 122f96d2d6..8cb058472c 100644 --- a/testing/btest/language/next-break-context-errors.zeek +++ b/testing/btest/language/next-break-context-errors.zeek @@ -9,7 +9,7 @@ function f() event zeek_init() { f(); }; -@TEST-START-NEXT +# @TEST-START-NEXT function f() { break; @@ -17,26 +17,26 @@ function f() event zeek_init() { f(); }; -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { next; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { break; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { if ( T ) break; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local history = "Sr"; @@ -48,7 +48,7 @@ event zeek_init() } } -@TEST-START-NEXT +# @TEST-START-NEXT global the_hook: hook(c: count); hook the_hook(c: count) @@ -56,7 +56,7 @@ hook the_hook(c: count) next; } -@TEST-START-NEXT +# @TEST-START-NEXT global the_hook: hook(c: count); hook the_hook(c: count) @@ -65,7 +65,7 @@ hook the_hook(c: count) next; } -@TEST-START-NEXT +# @TEST-START-NEXT # Should report 3 errors. global the_hook: hook(c: count); diff --git a/testing/btest/language/paraglob-serialization.zeek b/testing/btest/language/paraglob-serialization.zeek index 761dd280a5..0afe6f1b42 100644 --- a/testing/btest/language/paraglob-serialization.zeek +++ b/testing/btest/language/paraglob-serialization.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek redef exit_only_after_terminate = T; @@ -53,10 +53,10 @@ event pong(msg: opaque of paraglob, n: count) send_event(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek redef exit_only_after_terminate = T; @@ -98,4 +98,4 @@ event ping(msg: opaque of paraglob, n: count) Broker::publish("bro/event/my_topic", e); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/redeclaration-redefinition-errors.zeek b/testing/btest/language/redeclaration-redefinition-errors.zeek index d0f721c5fd..5c44f2b9d6 100644 --- a/testing/btest/language/redeclaration-redefinition-errors.zeek +++ b/testing/btest/language/redeclaration-redefinition-errors.zeek @@ -6,17 +6,17 @@ global x = 1; global x = 2; -@TEST-START-NEXT +# @TEST-START-NEXT global f: function() = function() { }; global f: function() = function() { }; -@TEST-START-NEXT +# @TEST-START-NEXT global f: function(); global f: function(); -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { @@ -24,38 +24,38 @@ event zeek_init() local f = function() { }; } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local f: function(); local f: function(); } -@TEST-START-NEXT +# @TEST-START-NEXT event zeek_init() { local x = 1; local x = 2; } -@TEST-START-NEXT +# @TEST-START-NEXT global ev: event(); global ev: event(); -@TEST-START-NEXT +# @TEST-START-NEXT global ev: event(x: bool, y: count); global ev: event(x: bool, y: count); -@TEST-START-NEXT +# @TEST-START-NEXT global ev: event(x: bool); global ev: event(xx: bool); -@TEST-START-NEXT +# @TEST-START-NEXT global f: event(); global f: hook(); global f: function(); -@TEST-START-NEXT +# @TEST-START-NEXT global f = function() { }; global f: hook(); global f: event(); diff --git a/testing/btest/language/sizeof-any.zeek b/testing/btest/language/sizeof-any.zeek index d9102edfcb..d8292f1c42 100644 --- a/testing/btest/language/sizeof-any.zeek +++ b/testing/btest/language/sizeof-any.zeek @@ -13,8 +13,8 @@ print aaa, type_name(aaa); print 1 + (aa as double); print 1 + aaa; -@TEST-START-FILE lacks-type-cast.zeek +# @TEST-START-FILE lacks-type-cast.zeek local a: any = double_to_time(13.0); local aa = |a|; print 1 + aa; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/language/table-default-insert-errors.zeek b/testing/btest/language/table-default-insert-errors.zeek index 5ce9fcc5ad..daa39b6b99 100644 --- a/testing/btest/language/table-default-insert-errors.zeek +++ b/testing/btest/language/table-default-insert-errors.zeek @@ -8,29 +8,29 @@ type R: record { a: string &default_insert="a"; }; -@TEST-START-NEXT +# @TEST-START-NEXT # Not applicable to sets. global s: set[string] &default_insert="a"; -@TEST-START-NEXT +# @TEST-START-NEXT # Wrong expression type global tbl: table[count] of string &default_insert=1; -@TEST-START-NEXT +# @TEST-START-NEXT # default function has wrong type global tbl: table[count] of string &default_insert=function(c: count): count { return c; }; -@TEST-START-NEXT +# @TEST-START-NEXT # default function has wrong type for inferred type global tbl = table([1] = "a") &default_insert=function(c: count): count { return c; }; -@TEST-START-NEXT +# @TEST-START-NEXT # Using &default and &default_insert together does not work. global tbl: table[count] of string &default="a" &default_insert="b"; -@TEST-START-NEXT +# @TEST-START-NEXT # Using &default and &default_insert together does not work, reversed order. global tbl: table[count] of string &default_insert="a" &default="b"; diff --git a/testing/btest/language/trailing-comma-error.zeek b/testing/btest/language/trailing-comma-error.zeek index a2a05edb23..0b68cdd2cd 100644 --- a/testing/btest/language/trailing-comma-error.zeek +++ b/testing/btest/language/trailing-comma-error.zeek @@ -4,49 +4,49 @@ global vec = vector(, 99, 99); -@TEST-START-NEXT +# @TEST-START-NEXT global vec = vector(99, 99, , ); -@TEST-START-NEXT +# @TEST-START-NEXT global rec = [,]; -@TEST-START-NEXT +# @TEST-START-NEXT type MyRecord: record { a: string; }; global rec = MyRecord(,$a="aaa"); -@TEST-START-NEXT +# @TEST-START-NEXT type MyRecord: record { a: string; }; global rec = MyRecord($a="aaa", ,); -@TEST-START-NEXT +# @TEST-START-NEXT function f(x: count, y: count, ) { } -@TEST-START-NEXT +# @TEST-START-NEXT function f(x: count, y: count) { } f(, 1, 2); -@TEST-START-NEXT +# @TEST-START-NEXT function f(x: count, y: count) { } f(1, 2, ,); -@TEST-START-NEXT +# @TEST-START-NEXT global tab: table[string, string] of string; tab["abc", "def", ] = "ghi"; -@TEST-START-NEXT +# @TEST-START-NEXT global tab: table[string, string] of string; tab[, "abc", "def"] = "ghi"; -@TEST-START-NEXT +# @TEST-START-NEXT global tab: table[string, string] of string = { ["abc", "def", ] = "ghi", }; -@TEST-START-NEXT +# @TEST-START-NEXT global tab = table( ["abc", "def", ] = "ghi", ); diff --git a/testing/btest/language/trailing-comma.zeek b/testing/btest/language/trailing-comma.zeek index d2563380d5..203f84a638 100644 --- a/testing/btest/language/trailing-comma.zeek +++ b/testing/btest/language/trailing-comma.zeek @@ -107,7 +107,7 @@ event zeek_init() print "tab9", type_name(tab9), tab9; } -@TEST-START-NEXT +# @TEST-START-NEXT # Function calls can have trailing commas. function f(x: count, y: count) { print fmt("f() x=%s y=%s", x, y); } f(1, 2,); diff --git a/testing/btest/language/type-coerce-numerics.zeek b/testing/btest/language/type-coerce-numerics.zeek index 561b3d5c0d..8764fdb7c2 100644 --- a/testing/btest/language/type-coerce-numerics.zeek +++ b/testing/btest/language/type-coerce-numerics.zeek @@ -23,7 +23,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff vectors.out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff vectors.err -@TEST-START-FILE first_set.zeek +# @TEST-START-FILE first_set.zeek type myrecord : record { ii: int &optional; cc: count &optional; @@ -79,9 +79,9 @@ event zeek_init() # throws an error local overflow = myrecord($ii = 9223372036854775808); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE double_convert_failure1.zeek +# @TEST-START-FILE double_convert_failure1.zeek type myrecord : record { cc: count &optional; }; @@ -90,9 +90,9 @@ event zeek_init() { local convert = myrecord($cc = 5.0); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE double_convert_failure2.zeek +# @TEST-START-FILE double_convert_failure2.zeek type myrecord : record { cc: count &optional; }; @@ -101,9 +101,9 @@ event zeek_init() { local convert = myrecord($cc = -5.0); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE int_convert_failure.zeek +# @TEST-START-FILE int_convert_failure.zeek type myrecord : record { cc: count &optional; }; @@ -112,9 +112,9 @@ event zeek_init() { local convert = myrecord($cc = -5); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE vectors.zeek +# @TEST-START-FILE vectors.zeek event zeek_init() { local c1 : vector of count = { 1 , 2 }; @@ -147,4 +147,4 @@ event zeek_init() print d2; print d3; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/plugins/enum-bif-plugin.zeek b/testing/btest/plugins/enum-bif-plugin.zeek index df8c796ea7..ffb715dae4 100644 --- a/testing/btest/plugins/enum-bif-plugin.zeek +++ b/testing/btest/plugins/enum-bif-plugin.zeek @@ -32,14 +32,14 @@ event zeek_init() @load ./enum-after-load-plugin-end -@TEST-START-FILE enum-before-load-plugin.zeek +# @TEST-START-FILE enum-before-load-plugin.zeek # empty -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE enum-after-load-plugin.zeek +# @TEST-START-FILE enum-after-load-plugin.zeek # empty -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE enum-after-load-plugin-end.zeek +# @TEST-START-FILE enum-after-load-plugin-end.zeek # empty -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/plugins/hooks.zeek b/testing/btest/plugins/hooks.zeek index 25e636a411..d49627be7b 100644 --- a/testing/btest/plugins/hooks.zeek +++ b/testing/btest/plugins/hooks.zeek @@ -13,21 +13,21 @@ @load-sigs s2 -@TEST-START-FILE s1.sig +# @TEST-START-FILE s1.sig # Just empty. -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE s2.sig +# @TEST-START-FILE s2.sig # Just empty. -@TEST-END-FILE +# @TEST-END-FILE # The built-in JavaScript plugin's __load__.zeek file uses cat() in its # __load__.zeek file, causing subtle baseline diffs as it is not enabled # on all platforms. Provide a mock file that is picked up before the # plugin's file due to `.` being first in ZEEKPATH. Sorry. -@TEST-START-FILE Zeek_JavaScript/__load__.zeek +# @TEST-START-FILE Zeek_JavaScript/__load__.zeek module JavaScript; export { global files: vector of string; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek b/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek index a359a3d286..22615b4efb 100644 --- a/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek +++ b/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff x509.log # @TEST-EXEC: btest-diff .stdout -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek @load base/protocols/ssl @load protocols/ssl/validate-certs.zeek @@ -23,11 +23,11 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri print "Hook for", e$certificate$subject; } -@TEST-END-FILE +# @TEST-END-FILE # First: Plain, no changes - certificate event caching won't even engage. -# @TEST-START-NEXT +# # @TEST-START-NEXT # Second - engage certificate caching. # Log files and events are unchanged - but the replay hook engages @@ -35,7 +35,7 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri redef X509::caching_required_encounters = 1; redef X509::certificate_cache_minimum_eviction_interval = 11min; -# @TEST-START-NEXT +# # @TEST-START-NEXT # Third - load policy script to not raise events # Log files are unchanged; events are not raised from the third time. diff --git a/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek b/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek index 3d4cbeecbf..6ebaac2fbd 100644 --- a/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek +++ b/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek @@ -5,7 +5,7 @@ # @TEST-EXEC: zeek -b -r $TRACES/rdp/rdp-to-ssl.pcap common.zeek rdp.zeek # @TEST-EXEC: btest-diff .stdout -@TEST-START-FILE common.zeek +# @TEST-START-FILE common.zeek @load base/protocols/ssl @@ -14,9 +14,9 @@ function test_it(cert_ref: opaque of x509, name: string, subject: string) print subject, name, x509_check_cert_hostname(cert_ref, name); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE google-duplicate.zeek +# @TEST-START-FILE google-duplicate.zeek event x509_certificate(f: fa_file, cert_ref: opaque of x509, cert: X509::Certificate) { @@ -27,9 +27,9 @@ event x509_certificate(f: fa_file, cert_ref: opaque of x509, cert: X509::Certifi test_it(cert_ref, "Google Internet Authority G2", cert$subject); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE fragmented.zeek +# @TEST-START-FILE fragmented.zeek event x509_certificate(f: fa_file, cert_ref: opaque of x509, cert: X509::Certificate) { @@ -39,9 +39,9 @@ event x509_certificate(f: fa_file, cert_ref: opaque of x509, cert: X509::Certifi test_it(cert_ref, "9566.alt.helloIamADomain.example", cert$subject); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE rdp.zeek +# @TEST-START-FILE rdp.zeek @load base/protocols/rdp @@ -52,4 +52,4 @@ event x509_certificate(f: fa_file, cert_ref: opaque of x509, cert: X509::Certifi test_it(cert_ref, "www.zeek.org", cert$subject); } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek index d72b2f77b2..4ea9b77d46 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek @@ -12,13 +12,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global my_pool_spec: Cluster::PoolSpec = Cluster::PoolSpec( diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek index 63081e2756..2234ad79b0 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek @@ -12,13 +12,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global my_pool_spec: Cluster::PoolSpec = Cluster::PoolSpec( diff --git a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek index 936362f88c..31e27fb151 100644 --- a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek @@ -12,13 +12,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Broker::forward_messages = T; diff --git a/testing/btest/scripts/base/frameworks/cluster/leftover-log-rotation-multi-logger.zeek b/testing/btest/scripts/base/frameworks/cluster/leftover-log-rotation-multi-logger.zeek index 93247ce6ce..8e11320716 100644 --- a/testing/btest/scripts/base/frameworks/cluster/leftover-log-rotation-multi-logger.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/leftover-log-rotation-multi-logger.zeek @@ -25,12 +25,12 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g"' btest-diff out -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=1234/tcp], ["logger-2"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=1235/tcp], }; -@TEST-END-FILE +# @TEST-END-FILE # Switch settings into a supervisor/non-zeekctl setup redef Log::default_rotation_dir = "log-queue"; diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek index 8ebc274fa5..5214d781a7 100644 --- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek @@ -16,7 +16,7 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::manager_is_logger = F; redef Cluster::nodes = { @@ -26,7 +26,7 @@ redef Cluster::nodes = { ["logger-10"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager"] }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0sec; diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek index 43c8ecbf07..b1c13f6d4a 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek @@ -21,7 +21,7 @@ @load base/frameworks/cluster -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::manager_is_logger = F; redef Cluster::nodes = { ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], @@ -31,7 +31,7 @@ redef Cluster::nodes = { ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global peer_count = 0; diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek index 91657d1f4c..c549a0cee7 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek @@ -18,7 +18,7 @@ @load base/frameworks/cluster -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], @@ -26,7 +26,7 @@ redef Cluster::nodes = { ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global peer_count = 0; diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek index 39d83414c0..635294522b 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek @@ -12,13 +12,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE event go_away() { diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek index 60511faa09..c46782b4d4 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek @@ -14,13 +14,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global q = 0; diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek index e966fc73ce..b56c5342d0 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek @@ -16,13 +16,13 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global q = 0; diff --git a/testing/btest/scripts/base/frameworks/config/basic.zeek b/testing/btest/scripts/base/frameworks/config/basic.zeek index c4dd75a6c5..982e08b56b 100644 --- a/testing/btest/scripts/base/frameworks/config/basic.zeek +++ b/testing/btest/scripts/base/frameworks/config/basic.zeek @@ -9,7 +9,7 @@ redef exit_only_after_terminate = T; redef Config::config_files += {"../configfile"}; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testcount 2 @@ -31,7 +31,7 @@ test_set a,b,c, test_vector 1,2,3,4,5,6 test_set test_set - -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek index 000efdb594..30f9198c8a 100644 --- a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek @@ -14,13 +14,13 @@ @load base/frameworks/config @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek index c397e5bdeb..70bbe18024 100644 --- a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek +++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek @@ -18,13 +18,13 @@ @load base/frameworks/config -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/config/missing-enum-value.zeek b/testing/btest/scripts/base/frameworks/config/missing-enum-value.zeek index adfa3d84a7..cedd3ee307 100644 --- a/testing/btest/scripts/base/frameworks/config/missing-enum-value.zeek +++ b/testing/btest/scripts/base/frameworks/config/missing-enum-value.zeek @@ -3,13 +3,13 @@ # @TEST-EXEC: btest-diff zeek/.stderr # @TEST-EXEC: btest-diff zeek/.stdout -@TEST-START-FILE configfile +# @TEST-START-FILE configfile mycolors Red,asdf,Blue nocolors color_vec Green bad_color_vec Green,1234,Blue no_color_vec -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/config diff --git a/testing/btest/scripts/base/frameworks/config/read_config.zeek b/testing/btest/scripts/base/frameworks/config/read_config.zeek index caf24e6ffa..2ad9061ace 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config.zeek +++ b/testing/btest/scripts/base/frameworks/config/read_config.zeek @@ -8,7 +8,7 @@ redef exit_only_after_terminate = T; redef InputConfig::empty_field = "(empty)"; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testcount 2 @@ -25,7 +25,7 @@ test_set a,b,c,d,erdbeerschnitzel test_vector 1,2,3,4,5,6 test_set (empty) test_set - -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek index 0fffb39788..21509c1cc8 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek @@ -23,15 +23,15 @@ @load base/protocols/conn -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testcount 2 @@ -48,7 +48,7 @@ test_vector 1,2,3,4,5,6 test_set (empty) test_set - test_set_full 1,3,4,5,6,7 -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/config/several-files.zeek b/testing/btest/scripts/base/frameworks/config/several-files.zeek index cc6d8ce8aa..0f490c4e0c 100644 --- a/testing/btest/scripts/base/frameworks/config/several-files.zeek +++ b/testing/btest/scripts/base/frameworks/config/several-files.zeek @@ -8,21 +8,21 @@ redef exit_only_after_terminate = T; redef Config::config_files += {"../configfile1", "../configfile2"}; -@TEST-START-FILE configfile1 +# @TEST-START-FILE configfile1 testbool F testcount 2 testint -1 testenum Conn::LOG test_set a,b,c,d,erdbeerschnitzel test_vector 1,2,3,4,5,6 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE configfile2 +# @TEST-START-FILE configfile2 testport 45 testaddr 127.0.0.1 testinterval 60 testtime 1507321987 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/config/updates.zeek b/testing/btest/scripts/base/frameworks/config/updates.zeek index 6097cab079..a80ce62889 100644 --- a/testing/btest/scripts/base/frameworks/config/updates.zeek +++ b/testing/btest/scripts/base/frameworks/config/updates.zeek @@ -14,7 +14,7 @@ redef exit_only_after_terminate = T; redef Config::config_files += {"../configfile"}; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testcount 2 @@ -28,9 +28,9 @@ testinterval 60 testtime 1507321987 test_set a,b,c,d,erdbeerschnitzel test_vector 1,2,3,4,5,6 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE configfile2 +# @TEST-START-FILE configfile2 testbool F testcount 1 testcount 2 @@ -44,9 +44,9 @@ testinterval 60 testtime 1507321987 test_set a,b,c,d,erdbeerschnitzel test_vector 1,2,3,4,5,9 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE configfile3 +# @TEST-START-FILE configfile3 testbool F testcount 2 testcount 2 @@ -57,9 +57,9 @@ testport 45 testinterval 60 testtime 1507321987 test_set a,b,c,d,erdbeerschnitzel -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE configfile4 +# @TEST-START-FILE configfile4 testbool F testcount 2 testcount 2 @@ -71,7 +71,7 @@ testinterval 60 testtime 1507321987 test_set a,b,c,d,erdbeerschnitzel test_vector 1,2,3,4,5,9 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek index 6e84419b74..d2507f7ee3 100644 --- a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek +++ b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek @@ -9,9 +9,9 @@ const test_var = "ORIGINAL VALUE (this should be printed out first)" &redef; -@TEST-START-FILE test-redef.zeek +# @TEST-START-FILE test-redef.zeek redef test_var = "NEW VALUE (this should be printed out second)"; -@TEST-END-FILE +# @TEST-END-FILE event zeek_init() { diff --git a/testing/btest/scripts/base/frameworks/control/id_value.zeek b/testing/btest/scripts/base/frameworks/control/id_value.zeek index a93d792a85..1910e5d819 100644 --- a/testing/btest/scripts/base/frameworks/control/id_value.zeek +++ b/testing/btest/scripts/base/frameworks/control/id_value.zeek @@ -10,11 +10,11 @@ # This value shouldn't ever be printed to the controllers stdout. const test_var = "Original value" &redef; -@TEST-START-FILE only-for-controllee.zeek +# @TEST-START-FILE only-for-controllee.zeek # This is only loaded on the controllee, but it's sent to the controller # and should be printed there. redef test_var = "This is the value from the controllee"; -@TEST-END-FILE +# @TEST-END-FILE event Control::id_value_response(id: string, val: string) { diff --git a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek b/testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek index 5cd5de80bd..e644aee2a0 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/input/basic.zeek @@ -10,13 +10,13 @@ redef test_get_file_name = function(f: fa_file): string return fmt("%s-file", f$id); }; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve ns #types bool int enum count port subnet addr double time interval string table table table vector vector string T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 -@TEST-END-FILE +# @TEST-END-FILE event zeek_init() { diff --git a/testing/btest/scripts/base/frameworks/file-analysis/logging-input-analysis.zeek b/testing/btest/scripts/base/frameworks/file-analysis/logging-input-analysis.zeek index e5e7858e1e..fb175c27d7 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/logging-input-analysis.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/logging-input-analysis.zeek @@ -10,7 +10,7 @@ event zeek_init() Input::add_analysis([$source=source, $name=source]); } -@TEST-START-FILE ./myfile +# @TEST-START-FILE ./myfile %PDF-1.5 This isn't an actual pdf, but it shows in files.log as such :-) -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek b/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek index cd8d3483b6..84002608b1 100644 --- a/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek +++ b/testing/btest/scripts/base/frameworks/input/bad_patterns.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: grep -v "already queued for removal" .stderr > out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i p #types count pattern @@ -11,7 +11,7 @@ 3 /foo|bar 4 this is not a pattern 5 /5 -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/basic.zeek b/testing/btest/scripts/base/frameworks/input/basic.zeek index e96784fc0d..a64752cea1 100644 --- a/testing/btest/scripts/base/frameworks/input/basic.zeek +++ b/testing/btest/scripts/base/frameworks/input/basic.zeek @@ -4,13 +4,13 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b bt i e c p pp sn a d t iv s sc ss se vc ve ns #types bool int enum count port port subnet addr double time interval string table table table vector vector string T 1 -42 SSH::LOG 21 123 5/icmp 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh diff --git a/testing/btest/scripts/base/frameworks/input/bignumber.zeek b/testing/btest/scripts/base/frameworks/input/bignumber.zeek index dd3a483050..bf72591537 100644 --- a/testing/btest/scripts/base/frameworks/input/bignumber.zeek +++ b/testing/btest/scripts/base/frameworks/input/bignumber.zeek @@ -4,13 +4,13 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i c #types int count 9223372036854775800 18446744073709551612 -9223372036854775800 18446744073709551612 -@TEST-END-FILE +# @TEST-END-FILE global outfile: file; diff --git a/testing/btest/scripts/base/frameworks/input/binary.zeek b/testing/btest/scripts/base/frameworks/input/binary.zeek index 1ea89ea91ba9a63de9713337dbed2b7adf4288e9..8cf4cffbdf55f7f652033c254a309fa8aff9be56 100644 GIT binary patch delta 23 bcmcb^@qlB4E+dn&!e(7YBQPD$^p_C;QNIRT delta 17 YcmaFBaff4rF5_l>MkB_}$xMG40XX>u*8l(j diff --git a/testing/btest/scripts/base/frameworks/input/config/basic.zeek b/testing/btest/scripts/base/frameworks/input/config/basic.zeek index 338d29c034..67e93156b8 100644 --- a/testing/btest/scripts/base/frameworks/input/config/basic.zeek +++ b/testing/btest/scripts/base/frameworks/input/config/basic.zeek @@ -6,7 +6,7 @@ redef exit_only_after_terminate = T; redef InputConfig::empty_field = "EMPTY"; redef InputConfig::set_separator = "\t"; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testcount 2 @@ -25,7 +25,7 @@ test_set (empty) test_set EMPTY test_set - teststring abc -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek b/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek index d5b0c7bbfb..b8864d09aa 100644 --- a/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek +++ b/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek @@ -3,9 +3,9 @@ # @TEST-EXEC: btest-diff zeek/.stdout # @TEST-EXEC: btest-diff zeek/config.log -@TEST-START-FILE configfile4 +# @TEST-START-FILE configfile4 DPD::ignore_violations Analyzer::ANALYZER_SYSLOG -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/config diff --git a/testing/btest/scripts/base/frameworks/input/config/errors.zeek b/testing/btest/scripts/base/frameworks/input/config/errors.zeek index 0271dbe711..86eed56438 100644 --- a/testing/btest/scripts/base/frameworks/input/config/errors.zeek +++ b/testing/btest/scripts/base/frameworks/input/config/errors.zeek @@ -5,7 +5,7 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool A testtesttesttesttesttest testbool A B @@ -14,7 +14,7 @@ testenum unknown testbooool T test_any F test_table whatever -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/input/config/spaces.zeek b/testing/btest/scripts/base/frameworks/input/config/spaces.zeek index 321deb3fa4..b836389820 100644 --- a/testing/btest/scripts/base/frameworks/input/config/spaces.zeek +++ b/testing/btest/scripts/base/frameworks/input/config/spaces.zeek @@ -5,7 +5,7 @@ redef exit_only_after_terminate = T; redef InputConfig::empty_field = "EMPTY"; -@TEST-START-FILE configfile +# @TEST-START-FILE configfile testbool F testcount 1 testint -1 @@ -13,7 +13,7 @@ testportandproto 45/udp testaddr 127.0.0.3 test_set 127.0.0.1, 127.0.0.2, 127.0.0.3 test_vector 10.0.0.1/32, 10.0.0.1/16, 10.0.0.1/8 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/input/default.zeek b/testing/btest/scripts/base/frameworks/input/default.zeek index a3e65e74e0..97ce1c0c8c 100644 --- a/testing/btest/scripts/base/frameworks/input/default.zeek +++ b/testing/btest/scripts/base/frameworks/input/default.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -14,7 +14,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek index 5064aaf63d..9bafa52387 100644 --- a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek +++ b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff events.out # @TEST-EXEC: btest-diff preds.out -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #fields i s ss #types int sting string @@ -15,15 +15,15 @@ 2 - TEST 3 TEST - 4 TEST TEST -@TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-END-FILE +# @TEST-START-FILE input2.log #separator \x09 #fields i s ss #types int sting string 1 TEST2 - 4 TEST2 TEST2 5 - TEST2 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/emptyvals.zeek b/testing/btest/scripts/base/frameworks/input/emptyvals.zeek index fcdae61aa9..9e80efd0f1 100644 --- a/testing/btest/scripts/base/frameworks/input/emptyvals.zeek +++ b/testing/btest/scripts/base/frameworks/input/emptyvals.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #path ssh #fields b i @@ -16,9 +16,9 @@ T 1 - 2 F - -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log #separator \x09 #path ssh #fields b i j @@ -26,7 +26,7 @@ F - T 1 1 - 2 2 F - 3 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/errors.zeek b/testing/btest/scripts/base/frameworks/input/errors.zeek index fe55530484..4f2d7a16b0 100644 --- a/testing/btest/scripts/base/frameworks/input/errors.zeek +++ b/testing/btest/scripts/base/frameworks/input/errors.zeek @@ -4,13 +4,13 @@ # @TEST-EXEC: btest-diff .stderr # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve ns #types bool int enum count port subnet addr double time interval string table table table vector vector string T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 -@TEST-END-FILE +# @TEST-END-FILE redef Input::accept_unsupported_types = T; diff --git a/testing/btest/scripts/base/frameworks/input/event.zeek b/testing/btest/scripts/base/frameworks/input/event.zeek index f23d9cf52d..cc07b53569 100644 --- a/testing/btest/scripts/base/frameworks/input/event.zeek +++ b/testing/btest/scripts/base/frameworks/input/event.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -14,7 +14,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/from_json.zeek b/testing/btest/scripts/base/frameworks/input/from_json.zeek index 547738ad29..75b1a528d5 100644 --- a/testing/btest/scripts/base/frameworks/input/from_json.zeek +++ b/testing/btest/scripts/base/frameworks/input/from_json.zeek @@ -2,14 +2,14 @@ # @TEST-EXEC: zeek -b %INPUT >out # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff out -@TEST-START-FILE denylist.jsonl +# @TEST-START-FILE denylist.jsonl {"ip": "192.168.0.1", "source": "local", "timestamp": "1990-09-22T12:13:14"} {"ip": "192.168.0.1", "source": "local", "timestamp": "1990-09-23T13:14:15"} {"ip": "192.168.0.2", "source": "local"} {"source": "local"} {... ] {"ip": "8.8.4.4", "source": "remote"} -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek b/testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek index 160011a8e9..bdd1394f5e 100644 --- a/testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalid-lines-duplicate.zeek @@ -6,7 +6,7 @@ redef exit_only_after_terminate = T; redef InputAscii::fail_on_invalid_lines = F; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #fields a b c #types string bool bool hello @@ -23,7 +23,7 @@ hello hello hello hello -@TEST-END-FILE +# @TEST-END-FILE type Key: record { a: string; diff --git a/testing/btest/scripts/base/frameworks/input/invalid-lines.zeek b/testing/btest/scripts/base/frameworks/input/invalid-lines.zeek index 25f7197785..e29fd67773 100644 --- a/testing/btest/scripts/base/frameworks/input/invalid-lines.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalid-lines.zeek @@ -7,7 +7,7 @@ redef exit_only_after_terminate = T; redef InputAscii::fail_on_invalid_lines = F; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i e c p pt sn a d t iv s sc ss se vc ve ns @@ -19,7 +19,7 @@ T -44 SSH::LOG 21 123 udp 10.0.0.0/24 342.2.3.4 3.14 1315801931.273616 100.00000 T -41 T -41 EMPTY 21 123 tcp 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 T -41 21 123 tcp 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh diff --git a/testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek b/testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek index 822e99f511..a82eb5c9d0 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalidnumbers.zeek @@ -6,7 +6,7 @@ # Note the tab+space separator in the last line of the following is # intentional. It verifies our whitespace handling. -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i c #types int count @@ -14,7 +14,7 @@ 9223372036854775801TEXTHERE 1Justtext Justtext 1 9223372036854775800 -18446744073709551612 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/invalidset.zeek b/testing/btest/scripts/base/frameworks/input/invalidset.zeek index d7aa47d164..0b5e408ee2 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidset.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalidset.zeek @@ -4,12 +4,12 @@ # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i s name - name 127.0.0.1 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; redef InputAscii::fail_on_invalid_lines = T; diff --git a/testing/btest/scripts/base/frameworks/input/invalidtable.zeek b/testing/btest/scripts/base/frameworks/input/invalidtable.zeek index 8a3f90d3b2..e26094ffc3 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidtable.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalidtable.zeek @@ -4,12 +4,12 @@ # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i y s name - 127.0.0.1 name name2 127.0.0.1 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; redef InputAscii::fail_on_invalid_lines = T; diff --git a/testing/btest/scripts/base/frameworks/input/invalidtext.zeek b/testing/btest/scripts/base/frameworks/input/invalidtext.zeek index 26c87f196d..8855117649 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidtext.zeek +++ b/testing/btest/scripts/base/frameworks/input/invalidtext.zeek @@ -4,13 +4,13 @@ # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i c #types int count l 5 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; redef InputAscii::fail_on_invalid_lines = T; diff --git a/testing/btest/scripts/base/frameworks/input/missing-enum.zeek b/testing/btest/scripts/base/frameworks/input/missing-enum.zeek index 9c5850cfac..6fd1be3d36 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-enum.zeek +++ b/testing/btest/scripts/base/frameworks/input/missing-enum.zeek @@ -3,10 +3,10 @@ # @TEST-EXEC: btest-diff zeek/.stderr # @TEST-EXEC: btest-diff zeek/.stdout -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #fields e i IdoNot::Exist 1 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek index cd1b962a4d..cbef14e246 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek +++ b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek @@ -13,13 +13,13 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -E "/Suppressed [0-9]+ warning\(s\)$/d" | $SCRIPTS/diff-sort' btest-diff zeek/.stderr -@TEST-START-FILE does-exist.dat +# @TEST-START-FILE does-exist.dat #separator \x09 #fields line #types string 1 now it does 2 and more! -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/missing-table-value.zeek b/testing/btest/scripts/base/frameworks/input/missing-table-value.zeek index 9091b02501..2a9b95c146 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-table-value.zeek +++ b/testing/btest/scripts/base/frameworks/input/missing-table-value.zeek @@ -3,13 +3,13 @@ # @TEST-EXEC: btest-diff zeek/.stderr # @TEST-EXEC: btest-diff zeek/.stdout -@TEST-START-FILE denylist.txt +# @TEST-START-FILE denylist.txt #separator \x09 #fields ip colors 192.168.17.1 Red,White 192.168.27.2 White,asdf 192.168.250.3 Blue -@TEST-END-FILE +# @TEST-END-FILE # test.zeek type Idx: record { diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek index 925ec13f82..02dbf05be2 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i #types bool int T -42 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek b/testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek index a55ddd318a..ae36c9fb95 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-record.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i #types bool int T -42 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/optional.zeek b/testing/btest/scripts/base/frameworks/input/optional.zeek index acea18810e..5a1b94529a 100644 --- a/testing/btest/scripts/base/frameworks/input/optional.zeek +++ b/testing/btest/scripts/base/frameworks/input/optional.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -14,7 +14,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek index b529760e40..fec3645fee 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek +++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek @@ -12,12 +12,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE subdir/input.data +# @TEST-START-FILE subdir/input.data #fields ip tag 127.0.3.1 just 127.0.3.2 some 127.0.3.3 value -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common-table.zeek redef InputAscii::path_prefix = "@path_prefix@"; @@ -28,7 +28,7 @@ event zeek_init() $destination=destination, $want_record=F]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test, but using event streams for input. @@ -41,7 +41,7 @@ event zeek_init() $fields=Val, $ev=inputev]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test again, but using file analysis w/ binary readers. diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek index 8e59555c11..e36ea62e05 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek +++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek @@ -6,12 +6,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE input.data +# @TEST-START-FILE input.data #fields ip tag 127.0.4.1 just 127.0.4.2 some 127.0.4.3 value -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common-table.zeek redef InputAscii::path_prefix = "/this/does/not/exist"; @@ -22,7 +22,7 @@ event zeek_init() $destination=destination, $want_record=F]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test, but using event streams for input. @@ -35,7 +35,7 @@ event zeek_init() $fields=Val, $ev=inputev]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test again, but using file analysis w/ binary readers. diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek index ae687bfe81..57cf5993c0 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek +++ b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek @@ -4,12 +4,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE input.data +# @TEST-START-FILE input.data #fields ip tag 127.0.0.1 just 127.0.0.2 some 127.0.0.3 value -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common-table.zeek @@ -19,7 +19,7 @@ event zeek_init() $destination=destination, $want_record=F]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test, but using event streams for input. @@ -31,7 +31,7 @@ event zeek_init() $fields=Val, $ev=inputev]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test again, but using file analysis w/ binary readers. diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek index 4a4d9208dc..8d376cc3fb 100644 --- a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek +++ b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek @@ -6,12 +6,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE alternative/input.data +# @TEST-START-FILE alternative/input.data #fields ip tag 127.0.1.1 just 127.0.1.2 some 127.0.1.3 value -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common-table.zeek redef InputAscii::path_prefix = "alternative"; @@ -22,7 +22,7 @@ event zeek_init() $destination=destination, $want_record=F]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test, but using event streams for input. @@ -35,7 +35,7 @@ event zeek_init() $fields=Val, $ev=inputev]); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # The same test again, but using file analysis w/ binary readers. diff --git a/testing/btest/scripts/base/frameworks/input/patterns.zeek b/testing/btest/scripts/base/frameworks/input/patterns.zeek index d8c714ac0b..61a1002e84 100644 --- a/testing/btest/scripts/base/frameworks/input/patterns.zeek +++ b/testing/btest/scripts/base/frameworks/input/patterns.zeek @@ -4,7 +4,7 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i p #types count pattern @@ -12,7 +12,7 @@ redef exit_only_after_terminate = T; 2 /cat/ 3 /foo|bar/ 4 /^oob/ -@TEST-END-FILE +# @TEST-END-FILE global outfile: file; diff --git a/testing/btest/scripts/base/frameworks/input/port-embedded.zeek b/testing/btest/scripts/base/frameworks/input/port-embedded.zeek index 5e8ad05fb7..5c3f2c5333 100644 --- a/testing/btest/scripts/base/frameworks/input/port-embedded.zeek +++ b/testing/btest/scripts/base/frameworks/input/port-embedded.zeek @@ -3,14 +3,14 @@ # @TEST-EXEC: btest-diff zeek/.stdout # @TEST-EXEC: btest-diff zeek/.stderr -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #fields i p 1.2.3.4 80/tcp 1.2.3.5 52/udp 1.2.3.6 30/unknown 1.2.3.7 50/trash 1.2.3.8 -1/tcp -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/port.zeek b/testing/btest/scripts/base/frameworks/input/port.zeek index b7a4b78913..9e7c7bc9d1 100644 --- a/testing/btest/scripts/base/frameworks/input/port.zeek +++ b/testing/btest/scripts/base/frameworks/input/port.zeek @@ -2,12 +2,12 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #fields i p t 1.2.3.4 80 tcp 1.2.3.5 52 udp 1.2.3.6 30 unknown -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/predicate-stream.zeek b/testing/btest/scripts/base/frameworks/input/predicate-stream.zeek index 25c818dae7..bfe36ddf4e 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate-stream.zeek +++ b/testing/btest/scripts/base/frameworks/input/predicate-stream.zeek @@ -6,7 +6,7 @@ # the reason is, that the code-paths are quite different, because then the # ascii reader uses the put and not the sendevent interface -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -18,7 +18,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/predicate.zeek b/testing/btest/scripts/base/frameworks/input/predicate.zeek index 61f1a5cf16..b536a0c881 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate.zeek +++ b/testing/btest/scripts/base/frameworks/input/predicate.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -14,7 +14,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodify.zeek b/testing/btest/scripts/base/frameworks/input/predicatemodify.zeek index 5de9f7bcc8..c162d49696 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodify.zeek +++ b/testing/btest/scripts/base/frameworks/input/predicatemodify.zeek @@ -2,14 +2,14 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 1 T test1 idx1 2 T test2 idx2 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek index 9f3d66df80..ebb1bf75bf 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek +++ b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.zeek @@ -12,48 +12,48 @@ # @TEST-EXEC: btest-diff out # -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 1 T test1 idx1 2 T test2 idx2 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 1 F test1 idx1 2 T test2 idx2 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-START-FILE input3.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 1 F test1 idx1 2 F test2 idx2 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input4.log +# @TEST-START-FILE input4.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 2 F test2 idx2 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input5.log +# @TEST-START-FILE input5.log #separator \x09 #path ssh #fields i b s ss #types int bool string string 1 T test1 idx1 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek index 79d38fab0d..f8de907d67 100644 --- a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek +++ b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.zeek @@ -7,12 +7,12 @@ # where the predicate accepts the first one and refuses the second one. # Desired result -> first entry stays. -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #fields restriction guid severity confidence detecttime address protocol portlist asn prefix rir cc impact description alternativeid_restriction alternativeid need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 65 1342656000 1.0.17.227 - - 2519 VECTANT VECTANT Ltd. 1.0.16.0/23 apnic JP spam infrastructure spamming public http://reputation.alienvault.com/reputation.generic need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 95 1342569600 1.228.83.33 6 25 9318 HANARO-AS Hanaro Telecom Inc. 1.224.0.0/13 apnic KR spam infrastructure direct ube sources, spam operations & spam services public http://www.spamhaus.org/query/bl?ip=1.228.83.33 need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 65 1342656000 1.228.83.33 - - 9318 HANARO-AS Hanaro Telecom Inc. 1.224.0.0/13 apnic KR spam infrastructure spamming;malware domain public http://reputation.alienvault.com/reputation.generic -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/basic.zeek b/testing/btest/scripts/base/frameworks/input/raw/basic.zeek index af246fdfcb..597c240466 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/basic.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/basic.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF q3r3057fdf @@ -11,7 +11,7 @@ sdfs\d dfsdf sdf 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/execute.zeek b/testing/btest/scripts/base/frameworks/input/raw/execute.zeek index 672d8131d1..8c3a308f9e 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/execute.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/execute.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: cat out.tmp | sed 's/^ *//g' >out # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF q3r3057fdf @@ -12,7 +12,7 @@ sdfs\d dfsdf sdf 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream-leftover.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestream-leftover.zeek index f40a7d52a3..73ad5244ed 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream-leftover.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream-leftover.zeek @@ -8,7 +8,7 @@ redef exit_only_after_terminate = T; redef Threading::heartbeat_interval = 0.01sec; -@TEST-START-FILE run.sh +# @TEST-START-FILE run.sh #!/usr/bin/env bash echo -e -n "aaa\nb" sleep 0.1 @@ -17,7 +17,7 @@ sleep 0.1 echo "nal" sleep infinity -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream-no-last-separator.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestream-no-last-separator.zeek index eeb77ac884..ad3b1f8555 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream-no-last-separator.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream-no-last-separator.zeek @@ -8,7 +8,7 @@ redef exit_only_after_terminate = T; redef Threading::heartbeat_interval = 0.01sec; -@TEST-START-FILE run.sh +# @TEST-START-FILE run.sh #!/usr/bin/env bash sleep 0.1 echo "aaa" @@ -19,7 +19,7 @@ echo -n "final" sleep 0.1 exit 0 -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream-slow-long.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestream-slow-long.zeek index da6e489b4e..cce2d52e13 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream-slow-long.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream-slow-long.zeek @@ -8,7 +8,7 @@ redef exit_only_after_terminate = T; redef Threading::heartbeat_interval = 0.01sec; -@TEST-START-FILE run.sh +# @TEST-START-FILE run.sh #!/usr/bin/env bash sleep 0.1 echo -n "binary start" @@ -28,7 +28,7 @@ sleep 0.1 echo "final" sleep infinity -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream-slow.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestream-slow.zeek index d221805b33..8ddd326725 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream-slow.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream-slow.zeek @@ -8,7 +8,7 @@ redef exit_only_after_terminate = T; redef Threading::heartbeat_interval = 0.01sec; -@TEST-START-FILE run.sh +# @TEST-START-FILE run.sh #!/usr/bin/env bash sleep 0.1 echo -n "aaa-" @@ -21,7 +21,7 @@ echo "aaa-bbb-ccc" echo "final" sleep infinity -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestream.zeek index 73aec5cab7..ed8205c263 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream.zeek @@ -9,22 +9,22 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF q3r3057fdf -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-START-FILE input3.log sdfs\d dfsdf sdf 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/offset.zeek b/testing/btest/scripts/base/frameworks/input/raw/offset.zeek index 87aa36fc8b..75a195de4e 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/offset.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/offset.zeek @@ -5,9 +5,9 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek index 138c83d299..2d1b86663a 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF q3r3057fdf @@ -11,13 +11,13 @@ sdfs\d dfsdf sdf 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log Beginning of input2.log 3rw43wRRERLlL#RWERERERE. game over -@TEST-END-FILE +# @TEST-END-FILE redef Threading::heartbeat_interval = 100msec; redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/rereadraw2.zeek b/testing/btest/scripts/base/frameworks/input/raw/rereadraw2.zeek index c996166d94..642677c675 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/rereadraw2.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/rereadraw2.zeek @@ -3,13 +3,13 @@ # @TEST-EXEC: zeek -b %INPUT > out # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log First Second Third Fourth -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/input diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek b/testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek index 741b3f92d6..a2a3ad2a61 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/streamraw.zeek @@ -9,22 +9,22 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF q3r3057fdf -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-START-FILE input3.log sdfs\d dfsdf sdf 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamtail.zeek b/testing/btest/scripts/base/frameworks/input/raw/streamtail.zeek index e1ec04ec80..400c764c8c 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/streamtail.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/streamtail.zeek @@ -23,17 +23,17 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-START-FILE input3.log 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamtail2.zeek b/testing/btest/scripts/base/frameworks/input/raw/streamtail2.zeek index fcc7cc826c..2657c59e14 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/streamtail2.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/streamtail2.zeek @@ -23,17 +23,17 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log sdfkh:KH;fdkncv;ISEUp34:Fkdj;YVpIODhfDF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-START-FILE input2.log DSF"DFKJ"SDFKLh304yrsdkfj@#(*U$34jfDJup3UF -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-START-FILE input3.log 3rw43wRRERLlL#RWERERERE. -@TEST-END-FILE +# @TEST-END-FILE module A; diff --git a/testing/btest/scripts/base/frameworks/input/repeat.zeek b/testing/btest/scripts/base/frameworks/input/repeat.zeek index db9a6018d0..7c46128e4a 100644 --- a/testing/btest/scripts/base/frameworks/input/repeat.zeek +++ b/testing/btest/scripts/base/frameworks/input/repeat.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b #types int bool 1 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/reread.zeek b/testing/btest/scripts/base/frameworks/input/reread.zeek index fa8b2f24bf..399959f519 100644 --- a/testing/btest/scripts/base/frameworks/input/reread.zeek +++ b/testing/btest/scripts/base/frameworks/input/reread.zeek @@ -16,30 +16,30 @@ # @TEST-EXEC: btest-diff events.out # @TEST-EXEC: btest-diff preds.out -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-END-FILE +# @TEST-START-FILE input2.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} T -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-END-FILE +# @TEST-START-FILE input3.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} F -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input4.log +# @TEST-END-FILE +# @TEST-START-FILE input4.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f @@ -51,14 +51,14 @@ F -45 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 0 -46 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} F -47 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} F -48 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input5.log +# @TEST-END-FILE +# @TEST-START-FILE input5.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func F -48 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh diff --git a/testing/btest/scripts/base/frameworks/input/set-event-reread.zeek b/testing/btest/scripts/base/frameworks/input/set-event-reread.zeek index ac85783c0e..f1b631202d 100644 --- a/testing/btest/scripts/base/frameworks/input/set-event-reread.zeek +++ b/testing/btest/scripts/base/frameworks/input/set-event-reread.zeek @@ -7,23 +7,23 @@ # @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff out -@TEST-START-FILE entries.set1 +# @TEST-START-FILE entries.set1 #fields s one two three -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE entries.set2 +# @TEST-START-FILE entries.set2 #fields s one -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE entries.set3 +# @TEST-START-FILE entries.set3 #fields s one four -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate=T; diff --git a/testing/btest/scripts/base/frameworks/input/set-event-stream.zeek b/testing/btest/scripts/base/frameworks/input/set-event-stream.zeek index 53072f30c1..21eca23a50 100644 --- a/testing/btest/scripts/base/frameworks/input/set-event-stream.zeek +++ b/testing/btest/scripts/base/frameworks/input/set-event-stream.zeek @@ -5,18 +5,18 @@ # @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff out -@TEST-START-FILE entries.set1 +# @TEST-START-FILE entries.set1 #fields s one two three -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE entries.set2 +# @TEST-START-FILE entries.set2 four five six -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate=T; diff --git a/testing/btest/scripts/base/frameworks/input/set.zeek b/testing/btest/scripts/base/frameworks/input/set.zeek index 0d1021adae..b74497e307 100644 --- a/testing/btest/scripts/base/frameworks/input/set.zeek +++ b/testing/btest/scripts/base/frameworks/input/set.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields ip #types addr @@ -11,7 +11,7 @@ 192.168.17.7 192.168.17.14 192.168.17.42 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/setseparator.zeek b/testing/btest/scripts/base/frameworks/input/setseparator.zeek index fc876e8a6d..f21c56d683 100644 --- a/testing/btest/scripts/base/frameworks/input/setseparator.zeek +++ b/testing/btest/scripts/base/frameworks/input/setseparator.zeek @@ -2,11 +2,11 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i s ss 1 a|b|c|d|e|f 1|2|3|4|5|6 -@TEST-END-FILE +# @TEST-END-FILE redef InputAscii::set_separator = "|"; diff --git a/testing/btest/scripts/base/frameworks/input/setspecialcases.zeek b/testing/btest/scripts/base/frameworks/input/setspecialcases.zeek index 32827c60e3..8556838edc 100644 --- a/testing/btest/scripts/base/frameworks/input/setspecialcases.zeek +++ b/testing/btest/scripts/base/frameworks/input/setspecialcases.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #fields i s ss 1 testing\x2ctesting\x2ctesting\x2c testing\x2ctesting\x2ctesting\x2c @@ -11,7 +11,7 @@ 4 testing, testing, 5 ,,, ,,, 6 -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek b/testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek index e1c4b54d74..c4ef731253 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek +++ b/testing/btest/scripts/base/frameworks/input/sqlite/basic.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE conn.sql +# @TEST-START-FILE conn.sql PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; CREATE TABLE conn ( @@ -71,7 +71,7 @@ INSERT INTO "conn" VALUES(1.30047516978033089643e+09,'1xFx4PGdeq5','141.142.220. INSERT INTO "conn" VALUES(1.3004751686520030498e+09,'WIG1ud65z22','141.142.220.118',35634,'208.80.152.2',80,6,'tcp',NULL,6.1328887939453125e-02,463,350,'OTH',NULL,NULL,0,'DdA',2,567,1,402,'(empty)',6); INSERT INTO "conn" VALUES(1.3004751688929131031e+09,'o2gAkl4V7sa','141.142.220.118',49999,'208.80.152.3',80,6,'tcp','http',2.20960855484008789062e-01,1137,733,'S1',NULL,NULL,0,'ShADad',6,1457,4,949,'(empty)',6); COMMIT; -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/error.zeek b/testing/btest/scripts/base/frameworks/input/sqlite/error.zeek index b6c2b46bbb..153fd5f80c 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/error.zeek +++ b/testing/btest/scripts/base/frameworks/input/sqlite/error.zeek @@ -9,7 +9,7 @@ # @TEST-EXEC: sed '1d' .stderr | sort > cmpfile # @TEST-EXEC: btest-diff cmpfile -@TEST-START-FILE ssh.sql +# @TEST-START-FILE ssh.sql PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; CREATE TABLE ssh ( @@ -33,7 +33,7 @@ CREATE TABLE ssh ( ); INSERT INTO "ssh" VALUES(1,-42,'SSH::LOG',21,123,'10.0.0.0/24','1.2.3.4',3.14,1.35837684939385390286e+09,100.0,'hurz','2,4,1,3','CC,AA,BB','(empty)','10,20,30','', null); COMMIT; -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/port.zeek b/testing/btest/scripts/base/frameworks/input/sqlite/port.zeek index ec0e9bd428..46ab4d8a5b 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/port.zeek +++ b/testing/btest/scripts/base/frameworks/input/sqlite/port.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE port.sql +# @TEST-START-FILE port.sql PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; CREATE TABLE port ( @@ -18,7 +18,7 @@ CREATE TABLE port ( INSERT INTO "port" VALUES(5353,'udp'); INSERT INTO "port" VALUES(6162,'tcp'); COMMIT; -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/types.zeek b/testing/btest/scripts/base/frameworks/input/sqlite/types.zeek index 6da0bef528..77979ba8d1 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/types.zeek +++ b/testing/btest/scripts/base/frameworks/input/sqlite/types.zeek @@ -8,7 +8,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE ssh.sql +# @TEST-START-FILE ssh.sql PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; CREATE TABLE ssh ( @@ -32,7 +32,7 @@ CREATE TABLE ssh ( ); INSERT INTO "ssh" VALUES(1,-42,'SSH::LOG',21,123,'10.0.0.0/24','1.2.3.4',3.14,1.35837684939385390286e+09,100.0,'hurz','2,4,1,3','CC,AA,BB','(empty)','10,20,30','', null); COMMIT; -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/stream.zeek b/testing/btest/scripts/base/frameworks/input/stream.zeek index b9064ef46b..d1803830c8 100644 --- a/testing/btest/scripts/base/frameworks/input/stream.zeek +++ b/testing/btest/scripts/base/frameworks/input/stream.zeek @@ -7,19 +7,19 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-END-FILE +# @TEST-START-FILE input2.log T -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-END-FILE +# @TEST-START-FILE input3.log F -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/subrecord-event.zeek b/testing/btest/scripts/base/frameworks/input/subrecord-event.zeek index 9f303fbb5a..eaced71608 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord-event.zeek +++ b/testing/btest/scripts/base/frameworks/input/subrecord-event.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields sub.b i sub.e sub.c sub.p sub.sn sub.two.a sub.two.d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/subrecord.zeek b/testing/btest/scripts/base/frameworks/input/subrecord.zeek index c01ce24158..6aafc65599 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord.zeek +++ b/testing/btest/scripts/base/frameworks/input/subrecord.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields sub.b i sub.e sub.c sub.p sub.sn sub.two.a sub.two.d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/tableevent.zeek b/testing/btest/scripts/base/frameworks/input/tableevent.zeek index 680a412c27..73c5d1ff87 100644 --- a/testing/btest/scripts/base/frameworks/input/tableevent.zeek +++ b/testing/btest/scripts/base/frameworks/input/tableevent.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields i b @@ -14,7 +14,7 @@ 5 F 6 F 7 T -@TEST-END-FILE +# @TEST-END-FILE redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/twotables.zeek b/testing/btest/scripts/base/frameworks/input/twotables.zeek index 1ab012bf0e..40c8a66a81 100644 --- a/testing/btest/scripts/base/frameworks/input/twotables.zeek +++ b/testing/btest/scripts/base/frameworks/input/twotables.zeek @@ -8,27 +8,27 @@ # @TEST-EXEC: btest-diff pred2.out # @TEST-EXEC: btest-diff fin.out -@TEST-START-FILE input1.log +# @TEST-START-FILE input1.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input2.log +# @TEST-END-FILE +# @TEST-START-FILE input2.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func T -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE -@TEST-START-FILE input3.log +# @TEST-END-FILE +# @TEST-START-FILE input3.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve f #types bool int enum count port subnet addr double time interval string table table table vector vector func F -44 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/unsupported_types.zeek b/testing/btest/scripts/base/frameworks/input/unsupported_types.zeek index e4e93f7164..5dc97feb8c 100644 --- a/testing/btest/scripts/base/frameworks/input/unsupported_types.zeek +++ b/testing/btest/scripts/base/frameworks/input/unsupported_types.zeek @@ -2,13 +2,13 @@ # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields fi b i e c p sn a d t iv s sc ss se vc ve f #types file bool int enum count port subnet addr double time interval string table table table vector vector func whatever T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY SSH::foo\x0a{ \x0aif (0 < SSH::i) \x0a\x09return (Foo);\x0aelse\x0a\x09return (Bar);\x0a\x0a} -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/windows.zeek b/testing/btest/scripts/base/frameworks/input/windows.zeek index 2615acb197..06016bf842 100644 --- a/testing/btest/scripts/base/frameworks/input/windows.zeek +++ b/testing/btest/scripts/base/frameworks/input/windows.zeek @@ -6,13 +6,13 @@ redef exit_only_after_terminate = T; -@TEST-START-FILE input.log +# @TEST-START-FILE input.log #separator \x09 #path ssh #fields b i e c p sn a d t iv s sc ss se vc ve ns #types bool int enum count port subnet addr double time interval string table table table vector vector string T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/ssh diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek index 7980ca47d4..6e5ba59935 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek @@ -17,14 +17,14 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek index 2fd2529431..de0e944d8a 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek @@ -14,13 +14,13 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek index 494103ec08..8b09bc0dfc 100644 --- a/testing/btest/scripts/base/frameworks/intel/filter-item.zeek +++ b/testing/btest/scripts/base/frameworks/intel/filter-item.zeek @@ -3,11 +3,11 @@ # @TEST-EXEC: btest-bg-wait 15 # @TEST-EXEC: btest-diff zeekproc/intel.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url 1.2.3.42 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 10.0.0.1 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek index 4222fb1d68..9433d5d816 100644 --- a/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek +++ b/testing/btest/scripts/base/frameworks/intel/input-and-match.zeek @@ -3,12 +3,12 @@ # @TEST-EXEC: btest-bg-wait 15 # @TEST-EXEC: btest-diff zeekproc/intel.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 e@mail.com Intel::EMAIL source1 Phishing email source http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek index ec27e998a7..6855f4a5a0 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek @@ -9,12 +9,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b input.zeek >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE intel/test.data +# @TEST-START-FILE intel/test.data #fields indicator indicator_type meta.source 127.0.2.1 Intel::ADDR this btest 127.0.2.2 Intel::ADDR this btest 127.0.2.3 Intel::ADDR this btest -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek index ecb74cc777..27256c41c0 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek @@ -6,12 +6,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE input/intel/test.data +# @TEST-START-FILE input/intel/test.data #fields indicator indicator_type meta.source 127.0.1.1 Intel::ADDR this btest 127.0.1.2 Intel::ADDR this btest 127.0.1.3 Intel::ADDR this btest -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek index f381c690b3..e966c23158 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek @@ -7,12 +7,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE alternative/test.data +# @TEST-START-FILE alternative/test.data #fields indicator indicator_type meta.source 127.0.0.1 Intel::ADDR this btest 127.0.0.2 Intel::ADDR this btest 127.0.0.3 Intel::ADDR this btest -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek index 2fadc01c24..76dda39978 100644 --- a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek +++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek @@ -4,12 +4,12 @@ # @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE test.data +# @TEST-START-FILE test.data #fields indicator indicator_type meta.source 127.0.0.1 Intel::ADDR this btest 127.0.0.2 Intel::ADDR this btest 127.0.0.3 Intel::ADDR this btest -@TEST-END-FILE +# @TEST-END-FILE @load path-prefix-common.zeek diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek index 833214f502..dda19545fd 100644 --- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek @@ -11,20 +11,20 @@ # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 e@mail.com Intel::EMAIL source1 Phishing email source http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/control @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/logging/delay/basic.zeek b/testing/btest/scripts/base/frameworks/logging/delay/basic.zeek index 1855e77e02..7264a62761 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/basic.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/basic.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Used by all tests below. # Debug printing @@ -51,7 +51,7 @@ event new_connection(c: connection) local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value"); Log::write(LOG, info); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Delay and immediately release. @@ -66,7 +66,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay_finish(id, rec, token); } -@TEST-START-NEXT +# @TEST-START-NEXT # Delay and immediately release, twice. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -82,7 +82,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay_finish(id, rec, token2); } -@TEST-START-NEXT +# @TEST-START-NEXT # Delay once, never release. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -94,7 +94,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay(id, rec); } -@TEST-START-NEXT +# @TEST-START-NEXT # Delay twice, never release. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -107,7 +107,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay(id, rec); } -@TEST-START-NEXT +# @TEST-START-NEXT # Delay twice, never release, print the token value and its JSON representation. hook Log::log_stream_policy(rec: Info, id: Log::ID) { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/coerce.zeek b/testing/btest/scripts/base/frameworks/logging/delay/coerce.zeek index 45f003b225..f0ff526d29 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/coerce.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/coerce.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Debug printing global packet_count = 0; event new_packet(c: connection, p: pkt_hdr) @@ -42,7 +42,7 @@ event zeek_init() { Log::create_stream(LOG, [$columns=Info, $path="test", $policy=log_policy]); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek hook Log::log_stream_policy(rec: Info, id: Log::ID) { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb-redelay.zeek b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb-redelay.zeek index 36e2b00e32..c25953eac8 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb-redelay.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb-redelay.zeek @@ -9,7 +9,7 @@ redef Log::default_max_delay_interval = 50msec; -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek global packet_count = 0; event new_packet(c: connection, p: pkt_hdr) @@ -51,7 +51,7 @@ event new_connection(c: connection) local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value"); Log::write(LOG, info); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Delay the given record twice using a nested lambda. hook Log::log_stream_policy(rec: Info, id: Log::ID) @@ -86,7 +86,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -@TEST-START-NEXT +# @TEST-START-NEXT # Delay the given record twice using a nested lambda, but also immediate release. hook Log::log_stream_policy(rec: Info, id: Log::ID) { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek index 0fcb07d5a0..658c406936 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: touch test.log && zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek global packet_count = 0; event new_packet(c: connection, p: pkt_hdr) @@ -52,7 +52,7 @@ event new_connection(c: connection) local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value"); Log::write(LOG, info); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Basic delay() test, no delay_finish() hook Log::log_stream_policy(rec: Info, id: Log::ID) @@ -80,7 +80,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Basic delay() test with delay_finish(), expect callback to be invoked # right at Log::delay_finish() hook Log::log_stream_policy(rec: Info, id: Log::ID) @@ -109,7 +109,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Basic delay() test with two callbacks but just one Log::delay_finish() call. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -142,7 +142,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Basic delay() test two callbacks and two Log::delay_finish() calls. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -176,7 +176,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -# @TEST-START-NEXT +# # @TEST-START-NEXT # The delay callback suppresses the log by return F. hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -203,7 +203,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Do a delay and immediate release with a callback. hook Log::log_stream_policy(rec: Info, id: Log::ID) { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/errors.zeek b/testing/btest/scripts/base/frameworks/logging/delay/errors.zeek index fab379de87..c52d9572e9 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/errors.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/errors.zeek @@ -18,7 +18,7 @@ event zeek_init() Log::delay_finish(LOG, rec, token); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/conn hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) @@ -27,7 +27,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay(id, copy(rec)); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/conn @load base/protocols/dns @@ -37,7 +37,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay(DNS::LOG, rec); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/conn hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) @@ -47,7 +47,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay_finish(id, copy(rec), token); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/conn hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) @@ -58,7 +58,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay_finish(id, rec, token); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/conn hook Conn::log_policy(rec: Conn::Info, id: Log::ID, filter: Log::Filter) diff --git a/testing/btest/scripts/base/frameworks/logging/delay/multi-write.zeek b/testing/btest/scripts/base/frameworks/logging/delay/multi-write.zeek index 9283cbffcd..38b0dc6528 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/multi-write.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/multi-write.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: touch test.log && zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek global packet_count = 0; event new_packet(c: connection, p: pkt_hdr) @@ -42,7 +42,7 @@ event zeek_init() { Log::create_stream(LOG, [$columns=Info, $path="test", $policy=log_policy]); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek event new_connection(c: connection) { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/nested-write.zeek b/testing/btest/scripts/base/frameworks/logging/delay/nested-write.zeek index 4ba803ee67..0254a012c1 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/nested-write.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/nested-write.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: touch test-other.log && zeek-cut -m -F'|' < test-other.log > test-other.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test-other.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Debug printing global packet_count = 0; @@ -55,7 +55,7 @@ event new_connection(c: connection) local info = Info($ts=network_time(), $uid=c$uid, $msg="inital-value"); Log::write(LOG, info); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek hook Log::log_stream_policy(rec: Info, id: Log::ID) { @@ -84,7 +84,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } } -@TEST-START-NEXT +# @TEST-START-NEXT hook Log::log_stream_policy(rec: Info, id: Log::ID) { local now = network_time(); diff --git a/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek b/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek index 447fe3b583..ad3eb50a35 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Used by all tests below. # Debug printing @@ -44,7 +44,7 @@ event Pcap::file_done(p: string) print network_time(), "Pcap::file_done", p; } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Delay records for a long time, reduce queue size after 10 packets to 3. event zeek_init() @@ -84,7 +84,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # Delay records for a long time, reduce queue size after 10 packets to 3, # re-delay all records once, provoking failure to free any space in the diff --git a/testing/btest/scripts/base/frameworks/logging/delay/queue-size.zeek b/testing/btest/scripts/base/frameworks/logging/delay/queue-size.zeek index de5c1c7866..2877e61f6f 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/queue-size.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/queue-size.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Used by all tests below. # Debug printing @@ -45,7 +45,7 @@ event Pcap::file_done(p: string) print network_time(), "Pcap::file_done", p; } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek event zeek_init() { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek b/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek index 1e010efec2..fddc3a33fb 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # Used by all tests below. # Debug printing @@ -44,7 +44,7 @@ event Pcap::file_done(p: string) print network_time(), "Pcap::file_done", p; } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Delay every record by 1msec. event zeek_init() @@ -75,7 +75,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # Delay every record, but call Log::delay_finish() immediately afterwards # through an event. @@ -114,7 +114,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) event release_delay(rec, token); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # # Delay every record, and for every other record call Log::delay_finish() # immediately afterwards via an event. @@ -159,7 +159,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Delay every entry by 10 seconds, but set queue size to 5 such that # entries are evicted when the queue size is reached. @@ -193,7 +193,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Re-delaying works even if that results in more forceful expiration. redef record Info += { @@ -239,7 +239,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay(id, rec, post_delay_cb); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Re-delay once after the delay expired. redef record Info += { @@ -284,7 +284,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID) Log::delay(id, rec, post_delay_cb); } -# @TEST-START-NEXT +# # @TEST-START-NEXT # Re-delay once after Log::delay_finish() redef record Info += { diff --git a/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek b/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek index 60ef1ed1dc..29a6057078 100644 --- a/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek +++ b/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek @@ -17,7 +17,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) } -# @TEST-START-NEXT +# # @TEST-START-NEXT @load base/protocols/conn # PostDelayCallback needs to return a bool @@ -32,7 +32,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay(id, rec, post_delay_cb); } -@TEST-START-NEXT +# @TEST-START-NEXT # Bad token type 1 @load base/protocols/conn @@ -43,7 +43,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID) Log::delay_finish(id, rec, "42"); } -@TEST-START-NEXT +# @TEST-START-NEXT # Bad token type 2 @load base/protocols/conn diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek index 7c0853430d..0462e2f762 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek @@ -8,12 +8,12 @@ # @TEST-EXEC: grep qux manager-1/reporter-2.log | sed 's#line ..*#line XX#g' >> manager-reporter.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | $SCRIPTS/diff-remove-abspath | grep -v ^# | $SCRIPTS/diff-sort" btest-diff manager-reporter.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/cluster @load base/frameworks/logging diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek index 72df6a0261..9a25005099 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek @@ -7,12 +7,12 @@ # @TEST-EXEC: btest-diff manager-1/http.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/conn @load base/protocols/http diff --git a/testing/btest/scripts/base/frameworks/logging/hooks.zeek b/testing/btest/scripts/base/frameworks/logging/hooks.zeek index ff1aa41423..14dacd4064 100644 --- a/testing/btest/scripts/base/frameworks/logging/hooks.zeek +++ b/testing/btest/scripts/base/frameworks/logging/hooks.zeek @@ -5,7 +5,7 @@ # @TEST-EXEC: if test -f other.log; then btest-diff other.log; fi # @TEST-EXEC: if test -f output; then btest-diff output; fi -@TEST-START-FILE test.zeek +# @TEST-START-FILE test.zeek # This provides a simple test module harness, used by all of the individual tests below. module Test; @@ -28,7 +28,7 @@ event zeek_init() &priority=2 Log::create_stream(Test::LOG, [$columns=Info, $path="test", $policy=log_policy]); Log::create_stream(Test::LOG_OTHER, [$columns=Info, $path="test_other"]); } -@TEST-END-FILE test.zeek +# @TEST-END-FILE test.zeek # Verify basic argument passing -- id and filter should be accessible # and have expected values. The hook should not catch. @@ -44,7 +44,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="foo"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that a policy hook can veto select log records. @@ -60,7 +60,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that a policy hook can alter the log entry. # @@ -79,7 +79,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="foo"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that multiple hook handlers can get registered and their # priorities work as expected. (More of a generic hook test than @@ -104,7 +104,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="foo"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that the stream-level policy gets inherited into additional # filters. The single hook handler should get invoked for both of the @@ -124,7 +124,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="foo"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that filters can override the stream-level policy. The # stream-level policy rejects select records; the overriding one is @@ -147,7 +147,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that filters can define their own policy hooks when the # stream doesn't provide any. The Test::LOG_OTHER stream does not. @@ -169,7 +169,7 @@ event zeek_init() Log::write(Test::LOG_OTHER, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that the global policy hook is effective. We have no # filter-specific hook handlers, only the global one is vetoing @@ -192,7 +192,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify the combination of global and filter-specific policy hooks. # The former get invoked first. @@ -226,7 +226,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify that per write, the global hook gets invoked once and the # filter-level hooks once per filter, that filter hooks get @@ -263,7 +263,7 @@ event zeek_init() Log::write(Test::LOG, [$t=network_time(), $status="bar"]); } -@TEST-START-NEXT +# @TEST-START-NEXT # Verify the global policy works on streams with no per-filter hooks, since # their logic is a bit intertwined. diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek index 3a1566b5a2..b2708c0cc5 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek @@ -10,7 +10,7 @@ # Testing all possible types. # -@TEST-START-FILE ssh.sql +# @TEST-START-FILE ssh.sql PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; CREATE TABLE ssh ( @@ -33,7 +33,7 @@ CREATE TABLE ssh ( ); INSERT INTO "ssh" VALUES(1,-42,'SSH::LOG',21,123,'10.0.0.0/24','1.2.3.4',3.14,1.36859359634203600879e+09,100.0,'hurz','2,4,1,3','CC,AA,BB','(empty)','10,20,30','(empty)'); COMMIT; -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek index 0b0bab2e6b..c559059c89 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load base/frameworks/netcontrol @load base/frameworks/broker @@ -88,9 +88,9 @@ event NetControl::rule_removed(r: NetControl::Rule, p: NetControl::PluginState, print "rule removed", r$entity, r$ty; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker @@ -132,5 +132,5 @@ event NetControl::acld_remove_rule(id: count, r: NetControl::Rule, ar: NetContro } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek index b710294bf9..03d0316010 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load base/frameworks/netcontrol @@ -92,9 +92,9 @@ event NetControl::rule_error(r: NetControl::Rule, p: NetControl::PluginState, ms print "rule error", r$entity, r$ty; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker @@ -142,5 +142,5 @@ event NetControl::acld_remove_rule(id: count, r: NetControl::Rule, ar: NetContro } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek index 7fcef9dc4b..ba73634078 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek @@ -13,13 +13,13 @@ # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek index 4773a3fa91..3bb95a8a4c 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load base/frameworks/netcontrol @@ -76,9 +76,9 @@ event NetControl::rule_timeout(r: NetControl::Rule, i: NetControl::FlowInfo, p: print "rule timeout", r$entity, r$ty, i; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load base/frameworks/netcontrol @load base/frameworks/broker @@ -126,5 +126,5 @@ event NetControl::broker_remove_rule(id: count, r: NetControl::Rule, reason: str } } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/netcontrol/rule-added-hook.zeek b/testing/btest/scripts/base/frameworks/netcontrol/rule-added-hook.zeek index 3452d55736..c8bf9d90eb 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/rule-added-hook.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/rule-added-hook.zeek @@ -17,7 +17,7 @@ event connection_established(c: connection) NetControl::drop_address(id$orig_h, 1sec); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/frameworks/netcontrol diff --git a/testing/btest/scripts/base/frameworks/notice/cluster.zeek b/testing/btest/scripts/base/frameworks/notice/cluster.zeek index e1f94715ca..ce0ff72580 100644 --- a/testing/btest/scripts/base/frameworks/notice/cluster.zeek +++ b/testing/btest/scripts/base/frameworks/notice/cluster.zeek @@ -11,13 +11,13 @@ @load policy/frameworks/cluster/experimental @load base/frameworks/notice -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/notice/file-info-no-conns.zeek b/testing/btest/scripts/base/frameworks/notice/file-info-no-conns.zeek index ed8b4309e1..0045027309 100644 --- a/testing/btest/scripts/base/frameworks/notice/file-info-no-conns.zeek +++ b/testing/btest/scripts/base/frameworks/notice/file-info-no-conns.zeek @@ -30,7 +30,7 @@ event zeek_init() Input::add_analysis([$source="./myfile", $name="./myfile"]); } -@TEST-START-FILE ./myfile +# @TEST-START-FILE ./myfile %PDF-1.5 This isn't an actual pdf, but it shows in files.log as such :-) -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek index 68d4407e74..6416675d2a 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek @@ -13,14 +13,14 @@ @load base/frameworks/notice @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek index f6f166013b..7252c23db5 100644 --- a/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek +++ b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-diff recv/recv.out # @TEST-EXEC: btest-diff send/send.out -@TEST-START-FILE send.zeek +# @TEST-START-FILE send.zeek @load base/protocols/conn @load base/frameworks/openflow @@ -78,9 +78,9 @@ event OpenFlow::flow_mod_failure(name: string, match: OpenFlow::ofp_match, flow_ got_message(); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE recv.zeek +# @TEST-START-FILE recv.zeek @load base/protocols/conn @load base/frameworks/openflow @@ -115,5 +115,5 @@ event OpenFlow::broker_flow_clear(name: string, dpid: count) print "flow_clear", dpid; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek index 3b5b243081..d82244cb9d 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek @@ -6,12 +6,12 @@ # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff manager-1/openflow.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; #redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek index 6a0efc16d2..f3c3ba620f 100644 --- a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek @@ -20,13 +20,13 @@ @load policy/frameworks/storage/backend/redis @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global redis_data_written: event() &is_used; diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek index 4f0c9d0841..9d96be4b43 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek @@ -12,13 +12,13 @@ @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek index f44bd183ae..d28420a6a2 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek @@ -11,13 +11,13 @@ @load base/frameworks/cluster @load base/frameworks/sumstats -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek index 295458d9ba..cabeb33865 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek @@ -10,12 +10,12 @@ @load base/frameworks/sumstats @load base/frameworks/cluster -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE global c = 0; diff --git a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek index 0ec2efb312..511271bbcb 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek @@ -12,13 +12,13 @@ @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek index b72aaeda60..4dc2c7511b 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek @@ -13,13 +13,13 @@ @load policy/frameworks/cluster/experimental @load base/frameworks/sumstats -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek index 63b8de2e8d..75f136baf1 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek @@ -12,13 +12,13 @@ @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; global did_data = F; diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek index 144f7f0c59..5d118c74ee 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek @@ -9,13 +9,13 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental diff --git a/testing/btest/scripts/base/frameworks/telemetry/sync.zeek b/testing/btest/scripts/base/frameworks/telemetry/sync.zeek index 8cecb911ad..0252970cb2 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/sync.zeek +++ b/testing/btest/scripts/base/frameworks/telemetry/sync.zeek @@ -21,7 +21,7 @@ # @TEST-EXEC: btest-diff metrics2.txt # @TEST-EXEC: btest-diff metrics3.txt -@TEST-START-FILE fetch-metrics.sh +# @TEST-START-FILE fetch-metrics.sh #! /usr/bin/env bash set -ux trace_file=$1 @@ -33,7 +33,7 @@ URL=http://localhost:${PORT}/metrics curl -m 5 --trace $trace_file $URL | grep ^btest > $output_file exit 0 -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/telemetry diff --git a/testing/btest/scripts/base/misc/version.zeek b/testing/btest/scripts/base/misc/version.zeek index 38dfad8f2d..012a5a7e6a 100644 --- a/testing/btest/scripts/base/misc/version.zeek +++ b/testing/btest/scripts/base/misc/version.zeek @@ -50,7 +50,7 @@ print Version::parse("JustARandomString"); # check that current running version of Zeek parses without error Version::parse(zeek_version()); -@TEST-START-NEXT +# @TEST-START-NEXT @if ( Version::number >= 20500 ) print "yup"; diff --git a/testing/btest/scripts/base/protocols/bittorrent/tracker.zeek b/testing/btest/scripts/base/protocols/bittorrent/tracker.zeek index d12040a672..9c69af4733 100644 --- a/testing/btest/scripts/base/protocols/bittorrent/tracker.zeek +++ b/testing/btest/scripts/base/protocols/bittorrent/tracker.zeek @@ -10,7 +10,7 @@ event bt_tracker_request(c: connection, uri: string, headers: bt_tracker_headers print c$id, uri, headers; } -@TEST-START-FILE bittorrent.sig +# @TEST-START-FILE bittorrent.sig # Reusing the old Bro 1.5 signatures here. @@ -42,4 +42,4 @@ signature dpd_bittorrent_peer2 { enable "bittorrent" } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/base/protocols/dhcp/cluster.zeek b/testing/btest/scripts/base/protocols/dhcp/cluster.zeek index 57ce58db5a..e2912ef6df 100644 --- a/testing/btest/scripts/base/protocols/dhcp/cluster.zeek +++ b/testing/btest/scripts/base/protocols/dhcp/cluster.zeek @@ -12,12 +12,12 @@ # @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff manager-1/dhcp.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/dhcp @load base/frameworks/broker diff --git a/testing/btest/scripts/base/protocols/socks/socks-auth.zeek b/testing/btest/scripts/base/protocols/socks/socks-auth.zeek index eabd4a6420..d1068944c1 100644 --- a/testing/btest/scripts/base/protocols/socks/socks-auth.zeek +++ b/testing/btest/scripts/base/protocols/socks/socks-auth.zeek @@ -6,6 +6,6 @@ redef SOCKS::default_capture_password = T; -@TEST-START-NEXT +# @TEST-START-NEXT @load base/protocols/socks diff --git a/testing/btest/scripts/base/utils/packages.zeek b/testing/btest/scripts/base/utils/packages.zeek index f9636def0a..3bc1d47617 100644 --- a/testing/btest/scripts/base/utils/packages.zeek +++ b/testing/btest/scripts/base/utils/packages.zeek @@ -17,16 +17,16 @@ print "no pkg3"; @endif -@TEST-START-FILE pkg1.zeek +# @TEST-START-FILE pkg1.zeek event zeek_init() { print "pkg1!"; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE pkg2/__load__.zeek +# @TEST-START-FILE pkg2/__load__.zeek event zeek_init() { print "pkg2!"; } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek index a8d7be51f4..f05a45f093 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek @@ -15,7 +15,7 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], @@ -23,7 +23,7 @@ redef Cluster::nodes = { ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek index 4ec92fe68d..b20748c9cf 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek @@ -17,7 +17,7 @@ @load policy/frameworks/cluster/experimental -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))], @@ -26,7 +26,7 @@ redef Cluster::nodes = { ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE redef Log::default_rotation_interval = 0secs; diff --git a/testing/btest/scripts/policy/frameworks/intel/removal.zeek b/testing/btest/scripts/policy/frameworks/intel/removal.zeek index a17983cfb6..8c095ba57d 100644 --- a/testing/btest/scripts/policy/frameworks/intel/removal.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/removal.zeek @@ -3,11 +3,11 @@ # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff zeekproc/intel.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.remove 10.0.0.1 Intel::ADDR source1 T 10.0.0.2 Intel::ADDR source1 F -@TEST-END-FILE +# @TEST-END-FILE @load frameworks/intel/removal diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek index 80fdd4ec55..7b81792973 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/certs.zeek @@ -4,12 +4,12 @@ # @TEST-EXEC: cat intel.log >> intel-all.log # @TEST-EXEC: btest-diff intel-all.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url www.pantz.org Intel::DOMAIN source1 test entry http://some-data-distributor.com/100000 www.dresdner-privat.de Intel::DOMAIN source1 test entry http://some-data-distributor.com/100000 2c322ae2b7fe91391345e070b63668978bb1c9da Intel::CERT_HASH source1 test entry http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/intel @load base/protocols/ssl diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-get-response.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-get-response.zeek index f951776f4a..230a0069ae 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-get-response.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-get-response.zeek @@ -7,10 +7,10 @@ redef Intel::read_files = { "./intel.dat" }; -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url test.json Intel::FILE_NAME source1 A JSON file https://www.json.org/json-en.html -@TEST-END-FILE +# @TEST-END-FILE event zeek_init() { diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-post.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-post.zeek index dc0db99e09..6bf2640965 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-post.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/filename-in-http-post.zeek @@ -7,11 +7,11 @@ redef Intel::read_files = { "./intel.dat" }; -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url putty.exe Intel::FILE_NAME source1 SSH utility https://www.putty.org zeek.exe Intel::FILE_NAME source1 A network monitor https://zeek.org -@TEST-END-FILE +# @TEST-END-FILE event zeek_init() { diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek index 8c5f20b4b0..3344044ffe 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smb.zeek @@ -5,10 +5,10 @@ @load base/frameworks/intel @load frameworks/intel/seen -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url pythonfile Intel::FILE_NAME source1 test entry http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE redef Intel::read_files += { "intel.dat" }; diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek index fbfca6f2de..5ce363af46 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek @@ -7,17 +7,17 @@ # @TEST-EXEC: btest-diff manager-1/intel.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url example@gmail.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load base/frameworks/cluster @load base/frameworks/intel diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek index 1873805a59..243a05843f 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smtp.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: zeek -b -r $TRACES/smtp-multi-addr.pcap %INPUT # @TEST-EXEC: btest-diff intel.log -@TEST-START-FILE intel.dat +# @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url jan.grashoefer@gmail.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 jan.grashoefer@cern.ch Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 @@ -9,7 +9,7 @@ jan.grashofer@cern.ch Intel::EMAIL source1 test entry http://some-data-distribut addr-spec@example.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 angle-addr@example.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 name-addr@example.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 -@TEST-END-FILE +# @TEST-END-FILE @load base/protocols/smtp @load base/frameworks/intel diff --git a/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release-two-plugins.zeek b/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release-two-plugins.zeek index 5b2fe6c5a0..0faf9ad99b 100644 --- a/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release-two-plugins.zeek +++ b/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release-two-plugins.zeek @@ -37,7 +37,7 @@ event NetControl::rule_added(r: NetControl::Rule, p: NetControl::PluginState, ms } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/frameworks/netcontrol @load policy/frameworks/netcontrol/catch-and-release diff --git a/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release.zeek b/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release.zeek index 23fe9be464..1f940844bf 100644 --- a/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release.zeek +++ b/testing/btest/scripts/policy/frameworks/netcontrol/catch-and-release.zeek @@ -31,7 +31,7 @@ event NetControl::rule_added(r: NetControl::Rule, p: NetControl::PluginState, ms NetControl::catch_release_seen(subnet_to_addr(r$entity$ip)); } -@TEST-START-NEXT +# @TEST-START-NEXT @load base/frameworks/netcontrol @load policy/frameworks/netcontrol/catch-and-release diff --git a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek index 231f743999..ae1072f138 100644 --- a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek +++ b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek @@ -22,16 +22,16 @@ # @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-diff manager-1/services.out -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1")), $metrics_port=to_port(getenv("METRICS_PORT1"))], ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT2"))], ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT3"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT4"))], }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE request-services.sh +# @TEST-START-FILE request-services.sh #! /usr/bin/env bash # This script makes repeat curl requests to find all of the metrics data from the @@ -52,7 +52,7 @@ for host in $(echo ${services_data} | jq -r '.[0].targets[]' | sort); do echo "Failed to request data from ${host}" >> ${output_file} fi done -@TEST-END-FILE +# @TEST-END-FILE @load policy/frameworks/cluster/experimental @load base/frameworks/telemetry diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek index 2f9aac32e5..b905917d57 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek @@ -9,13 +9,13 @@ # @TEST-EXEC: btest-diff manager-1/weird_stats.log -@TEST-START-FILE cluster-layout.zeek +# @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], }; -@TEST-END-FILE +# @TEST-END-FILE @load misc/weird-stats @load policy/frameworks/cluster/experimental diff --git a/testing/btest/scripts/policy/protocols/dns/detect-external-names-mdns-broadcast.zeek b/testing/btest/scripts/policy/protocols/dns/detect-external-names-mdns-broadcast.zeek index 4b1f35cd56..8d126031dc 100644 --- a/testing/btest/scripts/policy/protocols/dns/detect-external-names-mdns-broadcast.zeek +++ b/testing/btest/scripts/policy/protocols/dns/detect-external-names-mdns-broadcast.zeek @@ -10,7 +10,7 @@ redef Site::local_zones += {"example.inalid"}; -@TEST-START-NEXT +# @TEST-START-NEXT ##! second test - should output log due to changed config diff --git a/testing/btest/scripts/policy/protocols/ssl/decryption-keylog.zeek b/testing/btest/scripts/policy/protocols/ssl/decryption-keylog.zeek index 70e2baf5c4..7da7735f6a 100644 --- a/testing/btest/scripts/policy/protocols/ssl/decryption-keylog.zeek +++ b/testing/btest/scripts/policy/protocols/ssl/decryption-keylog.zeek @@ -2,7 +2,7 @@ # @TEST-EXEC: ZEEK_TLS_KEYLOG_FILE=keylogfile.log zeek -B dpd -C -r $TRACES/tls/tls-1.2-stream-keylog.pcap %INPUT -@TEST-START-FILE keylogfile.log +# @TEST-START-FILE keylogfile.log #fields client_random secret \x0e\x78\x2d\x35\x63\x95\x5d\x8a\x30\xa9\xcf\xb6\x4f\x47\xf3\x96\x34\x8a\x1e\x79\x1a\xa2\x32\x55\xe2\x2f\xc5\x7a \x34\x4f\x12\x65\xbf\x43\x40\xb3\x61\x6b\xa0\x16\x5d\x2b\x4d\xb9\xb1\xe8\x4a\x3d\xa2\x42\x0e\x38\xab\x01\x50\x62\x84\xcc\x34\xcd\xe0\x34\x10\xfe\x1a\x02\x30\x49\x74\x6c\x46\x43\xa7\x0c\x67\x0d \x24\x8c\x7e\x24\xee\xfb\x13\xcd\xee\xde\xb1\xf4\xb6\xd6\xd5\xee\x67\x8d\xd3\xff\xc7\xe7\x39\x23\x18\x3f\x99\xb4 \xe7\xed\x24\x26\x0d\x25\xd9\xfd\xf5\x0f\xc0\xf4\x56\x51\x0e\x4e\xec\x7f\x58\x9c\xaf\x39\x25\x14\x16\xa6\x71\xdd\xea\xfe\xe9\xc0\x93\xbe\x89\x4c\xab\xcc\xff\xb2\xf0\x9a\xea\x98\xf5\xb2\x53\x1e @@ -25,7 +25,7 @@ \x7a\xf0\xf4\x6e\x91\x8e\x38\x51\xfd\xd6\x42\xfb\x3e\x9b\x78\x29\x49\x3f\x78\x19\xd6\x2b\x61\xd5\x8b\xad\xfd\x70 \x78\xd8\x68\x51\x05\xc5\x3c\xeb\xcd\x22\xe0\x2e\x4b\x6f\xae\x53\x3f\xe8\x23\x73\xeb\xeb\x1b\xb2\x9a\x76\xca\x65\x01\x16\xa2\x97\x93\x60\xd5\x5d\xd4\xac\x52\x22\x16\x40\x15\x03\xb6\x23\xc1\xac \x31\x15\xDD\x9D\x68\x19\xB3\xBF\x45\x32\x99\x74\x0D\x04\xAE\x37\xAD\x69\xE5\x23\x4C\xD5\x40\xF8\xB5\x89\x4B\xA4 \x7C\x57\xC5\x98\xCD\x00\xE0\x0F\x55\x48\x6A\xF0\x02\x4E\x84\xB7\xAE\x07\xB5\xCD\xB1\x1E\x17\x2D\x24\xF0\xB3\xB3\xB8\x4B\x54\x4A\x82\x84\x15\xAD\x52\x24\x52\xBB\x34\x0D\x95\x30\x45\x3E\x15\x14 \x07\xDF\x9C\xC1\x59\xB6\x42\x8E\x57\x84\xED\xB1\x60\x37\xF3\x24\x2F\x70\x27\x5D\x07\xC4\xA8\xB9\xF0\xA7\xA6\x7F \x13\x9C\x33\x7E\x5C\x4E\x23\x5F\xCB\xFF\xD0\xD0\x54\x38\x0E\x04\x46\x2E\x6C\x8D\x51\x52\xEE\xAD\x79\x3F\x07\xA8\xCD\x18\x7D\x99\x99\x82\x1F\xA1\x51\xE2\xF6\xD4\x3F\x7B\x5C\x8A\xFE\x83\x6F\x4F -@TEST-END-FILE +# @TEST-END-FILE @load protocols/ssl/decryption @load base/protocols/http diff --git a/testing/btest/signatures/bad-eval-condition.zeek b/testing/btest/signatures/bad-eval-condition.zeek index 4491aaa710..504047f407 100644 --- a/testing/btest/signatures/bad-eval-condition.zeek +++ b/testing/btest/signatures/bad-eval-condition.zeek @@ -3,7 +3,7 @@ @load-sigs blah.sig -@TEST-START-FILE blah.sig +# @TEST-START-FILE blah.sig signature blah { ip-proto == tcp @@ -11,7 +11,7 @@ signature blah payload /.*/ eval mark_conn } -@TEST-END-FILE +# @TEST-END-FILE # wrong function signature for use with signature 'eval' conditions # needs to be reported diff --git a/testing/btest/signatures/custom-event-errors.zeek b/testing/btest/signatures/custom-event-errors.zeek index 9a6d80eb05..704b6eb51d 100644 --- a/testing/btest/signatures/custom-event-errors.zeek +++ b/testing/btest/signatures/custom-event-errors.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC-FAIL: zeek -b -s id -r $TRACES/chksums/ip4-udp-good-chksum.pcap %INPUT >id.out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr -@TEST-START-FILE id.sig +# @TEST-START-FILE id.sig signature udp-proto { ip-proto == 17 event wrong_signature2 "id" @@ -33,7 +33,7 @@ signature udp-proto6 { ip-proto == 17 event ignore_checksums # variable } -@TEST-END-FILE +# @TEST-END-FILE event wrong_signature2(state: signature_state, data: string) { } diff --git a/testing/btest/signatures/custom-event.zeek b/testing/btest/signatures/custom-event.zeek index 30719237d6..c00563456a 100644 --- a/testing/btest/signatures/custom-event.zeek +++ b/testing/btest/signatures/custom-event.zeek @@ -4,7 +4,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr # @TEST-EXEC: btest-diff out -@TEST-START-FILE id.sig +# @TEST-START-FILE id.sig signature udp-proto { ip-proto == 17 event my_signature_match3 "message" @@ -25,7 +25,7 @@ signature udp-stuff { event my_signature_match2 } -@TEST-END-FILE +# @TEST-END-FILE const mynets: set[subnet] = { 192.168.1.0/24, diff --git a/testing/btest/signatures/dpd.zeek b/testing/btest/signatures/dpd.zeek index 16e7f19724..7c6e9cbe5d 100644 --- a/testing/btest/signatures/dpd.zeek +++ b/testing/btest/signatures/dpd.zeek @@ -10,7 +10,7 @@ # DPD based on 'ip-proto' and 'payload' signatures should be independent # of IP protocol. -@TEST-START-FILE myftp.sig +# @TEST-START-FILE myftp.sig signature my_ftp_client { ip-proto == tcp payload /(|.*[\n\r]) *[uU][sS][eE][rR] / @@ -26,7 +26,7 @@ signature my_ftp_server { enable "ftp" event "matched my_ftp_server" } -@TEST-END-FILE +# @TEST-END-FILE @load base/utils/addrs diff --git a/testing/btest/signatures/dst-ip-cidr-v4.zeek b/testing/btest/signatures/dst-ip-cidr-v4.zeek index 5291f7a246..1883113ae1 100644 --- a/testing/btest/signatures/dst-ip-cidr-v4.zeek +++ b/testing/btest/signatures/dst-ip-cidr-v4.zeek @@ -1,13 +1,13 @@ # @TEST-EXEC: zeek -b -r $TRACES/ntp.pcap %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE a.sig +# @TEST-START-FILE a.sig signature foo { dst-ip == 17.0.0.0/8 ip-proto == udp event "match" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek b/testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek index 9389f11df2..28a7ba7fc6 100644 --- a/testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek +++ b/testing/btest/signatures/dst-ip-header-condition-v4-masks.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff dst-ip-ne-list.out # @TEST-EXEC: btest-diff dst-ip-ne-list-nomatch.out -@TEST-START-FILE dst-ip-eq.sig +# @TEST-START-FILE dst-ip-eq.sig signature id { dst-ip == 192.168.1.0/24 event "dst-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-nomatch.sig +# @TEST-START-FILE dst-ip-eq-nomatch.sig signature id { dst-ip == 10.0.0.0/8 event "dst-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-list.sig +# @TEST-START-FILE dst-ip-eq-list.sig signature id { dst-ip == 10.0.0.0/8,[fe80::0]/16,192.168.1.0/24 event "dst-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne.sig +# @TEST-START-FILE dst-ip-ne.sig signature id { dst-ip != 10.0.0.0/8 event "dst-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-nomatch.sig +# @TEST-START-FILE dst-ip-ne-nomatch.sig signature id { dst-ip != 192.168.1.0/24 event "dst-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list.sig +# @TEST-START-FILE dst-ip-ne-list.sig signature id { dst-ip != 10.0.0.0/8,[fe80::0]/16 event "dst-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list-nomatch.sig +# @TEST-START-FILE dst-ip-ne-list-nomatch.sig signature id { dst-ip != 10.0.0.0/8,[fe80::0]/16,192.168.1.0/24 event "dst-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/dst-ip-header-condition-v4.zeek b/testing/btest/signatures/dst-ip-header-condition-v4.zeek index b04d6c30ca..e2340bce02 100644 --- a/testing/btest/signatures/dst-ip-header-condition-v4.zeek +++ b/testing/btest/signatures/dst-ip-header-condition-v4.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff dst-ip-ne-list.out # @TEST-EXEC: btest-diff dst-ip-ne-list-nomatch.out -@TEST-START-FILE dst-ip-eq.sig +# @TEST-START-FILE dst-ip-eq.sig signature id { dst-ip == 192.168.1.101 event "dst-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-nomatch.sig +# @TEST-START-FILE dst-ip-eq-nomatch.sig signature id { dst-ip == 10.0.0.1 event "dst-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-list.sig +# @TEST-START-FILE dst-ip-eq-list.sig signature id { dst-ip == 10.0.0.1,10.0.0.2,[fe80::1],192.168.1.101 event "dst-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne.sig +# @TEST-START-FILE dst-ip-ne.sig signature id { dst-ip != 10.0.0.1 event "dst-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-nomatch.sig +# @TEST-START-FILE dst-ip-ne-nomatch.sig signature id { dst-ip != 192.168.1.101 event "dst-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list.sig +# @TEST-START-FILE dst-ip-ne-list.sig signature id { dst-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1] event "dst-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list-nomatch.sig +# @TEST-START-FILE dst-ip-ne-list-nomatch.sig signature id { dst-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1],192.168.1.101 event "dst-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek b/testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek index 9de148eb87..78d8d492ba 100644 --- a/testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek +++ b/testing/btest/signatures/dst-ip-header-condition-v6-masks.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff dst-ip-ne-list.out # @TEST-EXEC: btest-diff dst-ip-ne-list-nomatch.out -@TEST-START-FILE dst-ip-eq.sig +# @TEST-START-FILE dst-ip-eq.sig signature id { dst-ip == [2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "dst-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-nomatch.sig +# @TEST-START-FILE dst-ip-eq-nomatch.sig signature id { dst-ip == [fe80::0]/16 event "dst-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-list.sig +# @TEST-START-FILE dst-ip-eq-list.sig signature id { dst-ip == 10.0.0.0/8,[fe80::0]/16,[2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "dst-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne.sig +# @TEST-START-FILE dst-ip-ne.sig signature id { dst-ip != [2001:4f8:4:7:2e0:81ff:fe52:0]/120 event "dst-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-nomatch.sig +# @TEST-START-FILE dst-ip-ne-nomatch.sig signature id { dst-ip != [2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "dst-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list.sig +# @TEST-START-FILE dst-ip-ne-list.sig signature id { dst-ip != 10.0.0.0/8,[fe80::0]/16 event "dst-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list-nomatch.sig +# @TEST-START-FILE dst-ip-ne-list-nomatch.sig signature id { dst-ip != 10.0.0.0/8,[fe80::1]/16,[2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "dst-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/dst-ip-header-condition-v6.zeek b/testing/btest/signatures/dst-ip-header-condition-v6.zeek index 5bd64f8fc1..9a4ea9e710 100644 --- a/testing/btest/signatures/dst-ip-header-condition-v6.zeek +++ b/testing/btest/signatures/dst-ip-header-condition-v6.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff dst-ip-ne-list.out # @TEST-EXEC: btest-diff dst-ip-ne-list-nomatch.out -@TEST-START-FILE dst-ip-eq.sig +# @TEST-START-FILE dst-ip-eq.sig signature id { dst-ip == [2001:4f8:4:7:2e0:81ff:fe52:9a6b] event "dst-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-nomatch.sig +# @TEST-START-FILE dst-ip-eq-nomatch.sig signature id { dst-ip == 10.0.0.1 event "dst-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-eq-list.sig +# @TEST-START-FILE dst-ip-eq-list.sig signature id { dst-ip == 10.0.0.1,10.0.0.2,[fe80::1],[2001:4f8:4:7:2e0:81ff:fe52:9a6b] event "dst-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne.sig +# @TEST-START-FILE dst-ip-ne.sig signature id { dst-ip != 10.0.0.1 event "dst-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-nomatch.sig +# @TEST-START-FILE dst-ip-ne-nomatch.sig signature id { dst-ip != [2001:4f8:4:7:2e0:81ff:fe52:9a6b] event "dst-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list.sig +# @TEST-START-FILE dst-ip-ne-list.sig signature id { dst-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1] event "dst-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-ip-ne-list-nomatch.sig +# @TEST-START-FILE dst-ip-ne-list-nomatch.sig signature id { dst-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1],[2001:4f8:4:7:2e0:81ff:fe52:9a6b] event "dst-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/dst-port-header-condition.zeek b/testing/btest/signatures/dst-port-header-condition.zeek index 5f2f880d79..1d9f996192 100644 --- a/testing/btest/signatures/dst-port-header-condition.zeek +++ b/testing/btest/signatures/dst-port-header-condition.zeek @@ -39,124 +39,124 @@ # @TEST-EXEC: btest-diff dst-port-gte2.out # @TEST-EXEC: btest-diff dst-port-gte-nomatch.out -@TEST-START-FILE dst-port-eq.sig +# @TEST-START-FILE dst-port-eq.sig signature id { dst-port == 13000 event "dst-port-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-eq-nomatch.sig +# @TEST-START-FILE dst-port-eq-nomatch.sig signature id { dst-port == 22 event "dst-port-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-eq-list.sig +# @TEST-START-FILE dst-port-eq-list.sig signature id { dst-port == 22,23,24,13000 event "dst-port-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-ne.sig +# @TEST-START-FILE dst-port-ne.sig signature id { dst-port != 22 event "dst-port-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-ne-nomatch.sig +# @TEST-START-FILE dst-port-ne-nomatch.sig signature id { dst-port != 13000 event "dst-port-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-ne-list.sig +# @TEST-START-FILE dst-port-ne-list.sig signature id { dst-port != 22,23,24,25 event "dst-port-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-ne-list-nomatch.sig +# @TEST-START-FILE dst-port-ne-list-nomatch.sig signature id { dst-port != 22,23,24,25,13000 event "dst-port-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-lt.sig +# @TEST-START-FILE dst-port-lt.sig signature id { dst-port < 13001 event "dst-port-lt" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-lt-nomatch.sig +# @TEST-START-FILE dst-port-lt-nomatch.sig signature id { dst-port < 13000 event "dst-port-lt-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-lte1.sig +# @TEST-START-FILE dst-port-lte1.sig signature id { dst-port <= 13000 event "dst-port-lte1" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-lte2.sig +# @TEST-START-FILE dst-port-lte2.sig signature id { dst-port <= 13001 event "dst-port-lte2" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-lte-nomatch.sig +# @TEST-START-FILE dst-port-lte-nomatch.sig signature id { dst-port <= 12999 event "dst-port-lte-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-gt.sig +# @TEST-START-FILE dst-port-gt.sig signature id { dst-port > 12999 event "dst-port-gt" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-gt-nomatch.sig +# @TEST-START-FILE dst-port-gt-nomatch.sig signature id { dst-port > 13000 event "dst-port-gt-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-gte1.sig +# @TEST-START-FILE dst-port-gte1.sig signature id { dst-port >= 13000 event "dst-port-gte1" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-gte2.sig +# @TEST-START-FILE dst-port-gte2.sig signature id { dst-port >= 12999 event "dst-port-gte2" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE dst-port-gte-nomatch.sig +# @TEST-START-FILE dst-port-gte-nomatch.sig signature id { dst-port >= 13001 event "dst-port-gte-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/eval-condition-no-return-value.zeek b/testing/btest/signatures/eval-condition-no-return-value.zeek index 88a8e57ca1..14455f90f2 100644 --- a/testing/btest/signatures/eval-condition-no-return-value.zeek +++ b/testing/btest/signatures/eval-condition-no-return-value.zeek @@ -4,7 +4,7 @@ @load-sigs blah.sig -@TEST-START-FILE blah.sig +# @TEST-START-FILE blah.sig signature blah { ip-proto == tcp @@ -12,7 +12,7 @@ signature blah payload /.*/ eval mark_conn } -@TEST-END-FILE +# @TEST-END-FILE function mark_conn(state: signature_state, data: string): bool { diff --git a/testing/btest/signatures/eval-condition.zeek b/testing/btest/signatures/eval-condition.zeek index fc95a10700..61dd466190 100644 --- a/testing/btest/signatures/eval-condition.zeek +++ b/testing/btest/signatures/eval-condition.zeek @@ -5,7 +5,7 @@ @load base/protocols/ftp @load-sigs blah.sig -@TEST-START-FILE blah.sig +# @TEST-START-FILE blah.sig signature blah { ip-proto == tcp @@ -13,7 +13,7 @@ signature blah payload /.*/ eval mark_conn } -@TEST-END-FILE +# @TEST-END-FILE function mark_conn(state: signature_state, data: string): bool { diff --git a/testing/btest/signatures/header-header-condition.zeek b/testing/btest/signatures/header-header-condition.zeek index 545a9fdf40..f32a95454d 100644 --- a/testing/btest/signatures/header-header-condition.zeek +++ b/testing/btest/signatures/header-header-condition.zeek @@ -16,61 +16,61 @@ # @TEST-EXEC: btest-diff icmp6.out # @TEST-EXEC: btest-diff val-mask.out -@TEST-START-FILE ip.sig +# @TEST-START-FILE ip.sig signature id { header ip[10:1] == 0x7c event "ip" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE ip-mask.sig +# @TEST-START-FILE ip-mask.sig signature id { header ip[16:4] == 127.0.0.0/24 event "ip-mask" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE ip6.sig +# @TEST-START-FILE ip6.sig signature id { header ip6[10:1] == 0x04 event "ip6" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE udp.sig +# @TEST-START-FILE udp.sig signature id { header udp[2:1] == 0x32 event "udp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE tcp.sig +# @TEST-START-FILE tcp.sig signature id { header tcp[3:4] == 0x50000000 event "tcp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE icmp.sig +# @TEST-START-FILE icmp.sig signature id { header icmp[2:2] == 0xf7ff event "icmp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE icmp6.sig +# @TEST-START-FILE icmp6.sig signature id { header icmp6[0:1] == 0x80 event "icmp6" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE val-mask.sig +# @TEST-START-FILE val-mask.sig signature id { header udp[2:1] & 0x0f == 0x02 event "val-mask" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/http-body-match.zeek b/testing/btest/signatures/http-body-match.zeek index e7b944e65f..e426a525b9 100644 --- a/testing/btest/signatures/http-body-match.zeek +++ b/testing/btest/signatures/http-body-match.zeek @@ -4,7 +4,7 @@ @load-sigs test.sig @load base/protocols/http -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature http_request_body_AB_prefix { http-request-body /^AB/ event "HTTP request body starting with AB" @@ -30,7 +30,7 @@ signature http_response_body_CD_only { http-reply-body /^CD$/ event "HTTP response body containing CD only" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/id-lookup.zeek b/testing/btest/signatures/id-lookup.zeek index a100b0a624..2606095d43 100644 --- a/testing/btest/signatures/id-lookup.zeek +++ b/testing/btest/signatures/id-lookup.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: zeek -b -s id -r $TRACES/chksums/ip4-udp-good-chksum.pcap %INPUT >id.out # @TEST-EXEC: btest-diff id.out -@TEST-START-FILE id.sig +# @TEST-START-FILE id.sig signature id { ip-proto == udp_proto_number event "id" @@ -11,7 +11,7 @@ signature idtable { dst-ip == mynets event "idtable" } -@TEST-END-FILE +# @TEST-END-FILE const udp_proto_number = 17; diff --git a/testing/btest/signatures/ip-proto-header-condition.zeek b/testing/btest/signatures/ip-proto-header-condition.zeek index bbaf865f06..e4d0fde73f 100644 --- a/testing/btest/signatures/ip-proto-header-condition.zeek +++ b/testing/btest/signatures/ip-proto-header-condition.zeek @@ -14,33 +14,33 @@ # @TEST-EXEC: btest-diff icmp6_in_ip6.out # @TEST-EXEC: btest-diff nomatch.out -@TEST-START-FILE tcp.sig +# @TEST-START-FILE tcp.sig signature tcp_transport { ip-proto == tcp event "tcp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE udp.sig +# @TEST-START-FILE udp.sig signature udp_transport { ip-proto == udp event "udp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE icmp.sig +# @TEST-START-FILE icmp.sig signature icmp_transport { ip-proto == icmp event "icmp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE icmp6.sig +# @TEST-START-FILE icmp6.sig signature icmp6_transport { ip-proto == icmp6 event "icmp6" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/load-sigs.zeek b/testing/btest/signatures/load-sigs.zeek index eaac2f5910..1a6f065aab 100644 --- a/testing/btest/signatures/load-sigs.zeek +++ b/testing/btest/signatures/load-sigs.zeek @@ -12,10 +12,10 @@ event signature_match(state: signature_state, msg: string, data: string) print data; } -@TEST-START-FILE subdir/mysigs.sig +# @TEST-START-FILE subdir/mysigs.sig signature my-sig { ip-proto == tcp payload /GET \/images/ event "works" } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/signatures/signature-cond-used-twice.zeek b/testing/btest/signatures/signature-cond-used-twice.zeek index 49a4ae2d64..d6d23e9dc5 100644 --- a/testing/btest/signatures/signature-cond-used-twice.zeek +++ b/testing/btest/signatures/signature-cond-used-twice.zeek @@ -18,7 +18,7 @@ function signature_cond(state: signature_state, data: string): bool } -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature my-first-sig { ip-proto == tcp dst-port == 80 @@ -33,4 +33,4 @@ signature my-second-sig { event "STATUS" eval SignatureEvalTest::signature_cond } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/signatures/signature-cond-used.zeek b/testing/btest/signatures/signature-cond-used.zeek index a93f33596b..e1c921bf66 100644 --- a/testing/btest/signatures/signature-cond-used.zeek +++ b/testing/btest/signatures/signature-cond-used.zeek @@ -18,7 +18,7 @@ function signature_cond(state: signature_state, data: string): bool } -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature my-first-sig { ip-proto == tcp dst-port == 80 @@ -26,4 +26,4 @@ signature my-first-sig { event "GET" eval SignatureEvalTest::signature_cond } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/signatures/src-ip-header-condition-v4-masks.zeek b/testing/btest/signatures/src-ip-header-condition-v4-masks.zeek index 9c34853c8a..56b360c3e2 100644 --- a/testing/btest/signatures/src-ip-header-condition-v4-masks.zeek +++ b/testing/btest/signatures/src-ip-header-condition-v4-masks.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff src-ip-ne-list.out # @TEST-EXEC: btest-diff src-ip-ne-list-nomatch.out -@TEST-START-FILE src-ip-eq.sig +# @TEST-START-FILE src-ip-eq.sig signature id { src-ip == 192.168.1.0/24 event "src-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-nomatch.sig +# @TEST-START-FILE src-ip-eq-nomatch.sig signature id { src-ip == 10.0.0.0/8 event "src-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-list.sig +# @TEST-START-FILE src-ip-eq-list.sig signature id { src-ip == 10.0.0.0/8,[fe80::0]/16,192.168.1.0/24 event "src-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne.sig +# @TEST-START-FILE src-ip-ne.sig signature id { src-ip != 10.0.0.0/8 event "src-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-nomatch.sig +# @TEST-START-FILE src-ip-ne-nomatch.sig signature id { src-ip != 192.168.1.0/24 event "src-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list.sig +# @TEST-START-FILE src-ip-ne-list.sig signature id { src-ip != 10.0.0.0/8,[fe80::0]/16 event "src-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list-nomatch.sig +# @TEST-START-FILE src-ip-ne-list-nomatch.sig signature id { src-ip != 10.0.0.0/8,[fe80::0]/16,192.168.1.0/24 event "src-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/src-ip-header-condition-v4.zeek b/testing/btest/signatures/src-ip-header-condition-v4.zeek index 3eaa73ce9c..255587e33e 100644 --- a/testing/btest/signatures/src-ip-header-condition-v4.zeek +++ b/testing/btest/signatures/src-ip-header-condition-v4.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff src-ip-ne-list.out # @TEST-EXEC: btest-diff src-ip-ne-list-nomatch.out -@TEST-START-FILE src-ip-eq.sig +# @TEST-START-FILE src-ip-eq.sig signature id { src-ip == 192.168.1.100 event "src-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-nomatch.sig +# @TEST-START-FILE src-ip-eq-nomatch.sig signature id { src-ip == 10.0.0.1 event "src-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-list.sig +# @TEST-START-FILE src-ip-eq-list.sig signature id { src-ip == 10.0.0.1,10.0.0.2,[fe80::1],192.168.1.100 event "src-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne.sig +# @TEST-START-FILE src-ip-ne.sig signature id { src-ip != 10.0.0.1 event "src-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-nomatch.sig +# @TEST-START-FILE src-ip-ne-nomatch.sig signature id { src-ip != 192.168.1.100 event "src-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list.sig +# @TEST-START-FILE src-ip-ne-list.sig signature id { src-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1] event "src-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list-nomatch.sig +# @TEST-START-FILE src-ip-ne-list-nomatch.sig signature id { src-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1],192.168.1.100 event "src-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/src-ip-header-condition-v6-masks.zeek b/testing/btest/signatures/src-ip-header-condition-v6-masks.zeek index ad5ca917a9..e4068794ea 100644 --- a/testing/btest/signatures/src-ip-header-condition-v6-masks.zeek +++ b/testing/btest/signatures/src-ip-header-condition-v6-masks.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff src-ip-ne-list.out # @TEST-EXEC: btest-diff src-ip-ne-list-nomatch.out -@TEST-START-FILE src-ip-eq.sig +# @TEST-START-FILE src-ip-eq.sig signature id { src-ip == [2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "src-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-nomatch.sig +# @TEST-START-FILE src-ip-eq-nomatch.sig signature id { src-ip == [fe80::0]/16 event "src-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-list.sig +# @TEST-START-FILE src-ip-eq-list.sig signature id { src-ip == 10.0.0.0/8,[fe80::0]/16,[2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "src-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne.sig +# @TEST-START-FILE src-ip-ne.sig signature id { src-ip != [2001:4f8:4:7:2e0:81ff:fe52:0]/120 event "src-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-nomatch.sig +# @TEST-START-FILE src-ip-ne-nomatch.sig signature id { src-ip != [2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "src-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list.sig +# @TEST-START-FILE src-ip-ne-list.sig signature id { src-ip != 10.0.0.0/8,[fe80::0]/16 event "src-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list-nomatch.sig +# @TEST-START-FILE src-ip-ne-list-nomatch.sig signature id { src-ip != 10.0.0.0/8,[fe80::1]/16,[2001:4f8:4:7:2e0:81ff:fe52:0]/112 event "src-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/src-ip-header-condition-v6.zeek b/testing/btest/signatures/src-ip-header-condition-v6.zeek index 6ada9db299..ecb84bb9d6 100644 --- a/testing/btest/signatures/src-ip-header-condition-v6.zeek +++ b/testing/btest/signatures/src-ip-header-condition-v6.zeek @@ -16,54 +16,54 @@ # @TEST-EXEC: btest-diff src-ip-ne-list.out # @TEST-EXEC: btest-diff src-ip-ne-list-nomatch.out -@TEST-START-FILE src-ip-eq.sig +# @TEST-START-FILE src-ip-eq.sig signature id { src-ip == [2001:4f8:4:7:2e0:81ff:fe52:ffff] event "src-ip-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-nomatch.sig +# @TEST-START-FILE src-ip-eq-nomatch.sig signature id { src-ip == 10.0.0.1 event "src-ip-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-eq-list.sig +# @TEST-START-FILE src-ip-eq-list.sig signature id { src-ip == 10.0.0.1,10.0.0.2,[fe80::1],[2001:4f8:4:7:2e0:81ff:fe52:ffff] event "src-ip-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne.sig +# @TEST-START-FILE src-ip-ne.sig signature id { src-ip != 10.0.0.1 event "src-ip-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-nomatch.sig +# @TEST-START-FILE src-ip-ne-nomatch.sig signature id { src-ip != [2001:4f8:4:7:2e0:81ff:fe52:ffff] event "src-ip-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list.sig +# @TEST-START-FILE src-ip-ne-list.sig signature id { src-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1] event "src-ip-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-ip-ne-list-nomatch.sig +# @TEST-START-FILE src-ip-ne-list-nomatch.sig signature id { src-ip != 10.0.0.1,10.0.0.2,10.0.0.3,[fe80::1],[2001:4f8:4:7:2e0:81ff:fe52:ffff] event "src-ip-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/src-port-header-condition.zeek b/testing/btest/signatures/src-port-header-condition.zeek index 841817e79c..da63436944 100644 --- a/testing/btest/signatures/src-port-header-condition.zeek +++ b/testing/btest/signatures/src-port-header-condition.zeek @@ -43,131 +43,131 @@ # @TEST-EXEC: btest-diff src-port-range.out -@TEST-START-FILE src-port-eq.sig +# @TEST-START-FILE src-port-eq.sig signature id { src-port == 30000 event "src-port-eq" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-eq-nomatch.sig +# @TEST-START-FILE src-port-eq-nomatch.sig signature id { src-port == 22 event "src-port-eq-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-eq-list.sig +# @TEST-START-FILE src-port-eq-list.sig signature id { src-port == 22,23,24,30000 event "src-port-eq-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-ne.sig +# @TEST-START-FILE src-port-ne.sig signature id { src-port != 22 event "src-port-ne" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-ne-nomatch.sig +# @TEST-START-FILE src-port-ne-nomatch.sig signature id { src-port != 30000 event "src-port-ne-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-ne-list.sig +# @TEST-START-FILE src-port-ne-list.sig signature id { src-port != 22,23,24,25 event "src-port-ne-list" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-ne-list-nomatch.sig +# @TEST-START-FILE src-port-ne-list-nomatch.sig signature id { src-port != 22,23,24,25,30000 event "src-port-ne-list-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-lt.sig +# @TEST-START-FILE src-port-lt.sig signature id { src-port < 30001 event "src-port-lt" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-lt-nomatch.sig +# @TEST-START-FILE src-port-lt-nomatch.sig signature id { src-port < 30000 event "src-port-lt-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-lte1.sig +# @TEST-START-FILE src-port-lte1.sig signature id { src-port <= 30000 event "src-port-lte1" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-lte2.sig +# @TEST-START-FILE src-port-lte2.sig signature id { src-port <= 30001 event "src-port-lte2" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-lte-nomatch.sig +# @TEST-START-FILE src-port-lte-nomatch.sig signature id { src-port <= 29999 event "src-port-lte-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-gt.sig +# @TEST-START-FILE src-port-gt.sig signature id { src-port > 29999 event "src-port-gt" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-gt-nomatch.sig +# @TEST-START-FILE src-port-gt-nomatch.sig signature id { src-port > 30000 event "src-port-gt-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-gte1.sig +# @TEST-START-FILE src-port-gte1.sig signature id { src-port >= 30000 event "src-port-gte1" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-gte2.sig +# @TEST-START-FILE src-port-gte2.sig signature id { src-port >= 29999 event "src-port-gte2" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-gte-nomatch.sig +# @TEST-START-FILE src-port-gte-nomatch.sig signature id { src-port >= 30001 event "src-port-gte-nomatch" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE src-port-range.sig +# @TEST-START-FILE src-port-range.sig signature id { src-port == 29997-29999,30001-30002,30003 event "src-port-range" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/tcp-end-of-match.zeek b/testing/btest/signatures/tcp-end-of-match.zeek index 5e7bb7dac6..0199724844 100644 --- a/testing/btest/signatures/tcp-end-of-match.zeek +++ b/testing/btest/signatures/tcp-end-of-match.zeek @@ -48,7 +48,7 @@ event portability_match_with_msg(state: signature_state, msg: string, data: stri print "portability_match_with_msg", msg, |data|; } -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature with-msg { ip-proto == tcp payload /.*portability.*/ # this is in the second packet. @@ -66,4 +66,4 @@ signature my-custom-event2 { payload /.*portability.*/ # this is in the second packet. event DataEndOffset::portability_match_with_msg "custom message" } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/signatures/tcp-syn-with-payload.zeek b/testing/btest/signatures/tcp-syn-with-payload.zeek index 0b20c23353..f40d8cc5e5 100644 --- a/testing/btest/signatures/tcp-syn-with-payload.zeek +++ b/testing/btest/signatures/tcp-syn-with-payload.zeek @@ -5,14 +5,14 @@ # @TEST-EXEC: btest-diff payload-synack.out # @TEST-EXEC: btest-diff tcp-fast-open.out -@TEST-START-FILE payload-http.sig +# @TEST-START-FILE payload-http.sig signature test-signature { ip-proto == tcp dst-port = 80 payload /.*passwd/ event "payload of dst-port=80/tcp contains 'passwd'" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/udp-end-of-match.zeek b/testing/btest/signatures/udp-end-of-match.zeek index de7113476d..dd2b3a5434 100644 --- a/testing/btest/signatures/udp-end-of-match.zeek +++ b/testing/btest/signatures/udp-end-of-match.zeek @@ -12,11 +12,11 @@ event signature_match(state: signature_state, msg: string, data: string, data_en for ( i in s ) print s[i]; } -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature my_sig_udp_orig { ip-proto == udp payload /.+google/ udp-state originator event "my_sig_udp_orig" } -@TEST-END-FILE +# @TEST-END-FILE diff --git a/testing/btest/signatures/udp-packetwise-insensitive.zeek b/testing/btest/signatures/udp-packetwise-insensitive.zeek index d63401739c..8a548170be 100644 --- a/testing/btest/signatures/udp-packetwise-insensitive.zeek +++ b/testing/btest/signatures/udp-packetwise-insensitive.zeek @@ -3,7 +3,7 @@ @load-sigs test.sig -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature xxxx { ip-proto = udp payload /xXxX/i @@ -45,7 +45,7 @@ signature nope { payload /.*nope/i event "Found .*nope" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/udp-packetwise-match.zeek b/testing/btest/signatures/udp-packetwise-match.zeek index 39d1805880..e916292c85 100644 --- a/testing/btest/signatures/udp-packetwise-match.zeek +++ b/testing/btest/signatures/udp-packetwise-match.zeek @@ -3,7 +3,7 @@ @load-sigs test.sig -@TEST-START-FILE test.sig +# @TEST-START-FILE test.sig signature xxxx { ip-proto = udp payload /XXXX/ @@ -45,7 +45,7 @@ signature nope { payload /.*nope/ event "Found .*nope" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/udp-payload-size.zeek b/testing/btest/signatures/udp-payload-size.zeek index ee3c38fff3..09a78ddc95 100644 --- a/testing/btest/signatures/udp-payload-size.zeek +++ b/testing/btest/signatures/udp-payload-size.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: zeek -b -r $TRACES/ntp.pcap %INPUT >output # @TEST-EXEC: btest-diff output -@TEST-START-FILE a.sig +# @TEST-START-FILE a.sig signature foo1 { ip-proto == udp payload-size < 1 @@ -13,7 +13,7 @@ signature foo2 { payload-size > 0 event "match" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/signatures/udp-state.zeek b/testing/btest/signatures/udp-state.zeek index 13cb3d1b8a..b5aa66cc02 100644 --- a/testing/btest/signatures/udp-state.zeek +++ b/testing/btest/signatures/udp-state.zeek @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff reject -@TEST-START-FILE udp-states.sig +# @TEST-START-FILE udp-states.sig signature my_sig_udp_orig { ip-proto == udp payload /.+/ @@ -17,16 +17,16 @@ signature my_sig_udp_resp { udp-state responder event "my_sig_udp_resp" } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE udp-established.sig +# @TEST-START-FILE udp-established.sig signature my_sig_udp_est { ip-proto == udp payload /.+/ udp-state established event "my_sig_udp_est" } -@TEST-END-FILE +# @TEST-END-FILE event signature_match(state: signature_state, msg: string, data: string) { diff --git a/testing/btest/spicy/list-conversion.zeek b/testing/btest/spicy/list-conversion.zeek index be97085cf6..ee9ca435fd 100644 --- a/testing/btest/spicy/list-conversion.zeek +++ b/testing/btest/spicy/list-conversion.zeek @@ -8,7 +8,7 @@ event zeek_init() { Analyzer::register_for_port(Analyzer::ANALYZER_LISTCONV, 22/tcp); } -@TEST-START-FILE listconv.spicy +# @TEST-START-FILE listconv.spicy module listconv; @@ -22,9 +22,9 @@ public type Test = unit { c: uint16; }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE listconv.evt +# @TEST-START-FILE listconv.evt protocol analyzer listconv over TCP: parse originator with listconv::Test; @@ -36,7 +36,7 @@ on listconv::Test -> event listconv::test($conn, self.c ); -@TEST-END-FILE +# @TEST-END-FILE type int_tuple: record { a: count; diff --git a/testing/btest/spicy/type-converter.zeek b/testing/btest/spicy/type-converter.zeek index f4be4602c4..22d3281b6e 100644 --- a/testing/btest/spicy/type-converter.zeek +++ b/testing/btest/spicy/type-converter.zeek @@ -8,7 +8,7 @@ event zeek_init() { Analyzer::register_for_port(Analyzer::ANALYZER_CONV, 22/tcp); } -@TEST-START-FILE conv.spicy +# @TEST-START-FILE conv.spicy module Conv; @@ -43,10 +43,10 @@ type MyStruct = struct { s: string &optional; }; -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE conv.evt +# @TEST-START-FILE conv.evt protocol analyzer Conv over TCP: parse originator with Conv::Test; @@ -73,7 +73,7 @@ on Conv::Test -> event conv::test($conn, self.n ); -@TEST-END-FILE +# @TEST-END-FILE type MyRecord: record { i: int; diff --git a/testing/btest/supervisor/config-scripts.zeek b/testing/btest/supervisor/config-scripts.zeek index 3a56922ac8..8197ba96b3 100644 --- a/testing/btest/supervisor/config-scripts.zeek +++ b/testing/btest/supervisor/config-scripts.zeek @@ -69,7 +69,7 @@ event zeek_done() print supervisor_output_file, "supervisor zeek_done()"; } -@TEST-START-FILE addl_base_script.zeek +# @TEST-START-FILE addl_base_script.zeek module Pre; @@ -77,9 +77,9 @@ export { global counter = 0; } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE addl_user_script.zeek +# @TEST-START-FILE addl_user_script.zeek event zeek_init() &priority=-10 { @@ -87,9 +87,9 @@ event zeek_init() &priority=-10 print node_output_file, fmt("supervised node loaded addl_user_script.zeek, counter at %s", Pre::counter); } -@TEST-END-FILE +# @TEST-END-FILE -@TEST-START-FILE script.zeek +# @TEST-START-FILE script.zeek event zeek_init() &priority=-20 { @@ -97,4 +97,4 @@ event zeek_init() &priority=-20 print node_output_file, fmt("supervised node loaded script.zeek, counter at %s", Pre::counter); } -@TEST-END-FILE +# @TEST-END-FILE