Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tweaks for "-O C++" of BTest's with conditional code

Browse source
This commit is contained in:
Vern Paxson 2023-04-01 20:26:55 -07:00
parent 5718046b96
commit 2f9272f2d5
3 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
testing/btest/language/at-if-lambda.zeek
View file

@ -9,11 +9,7 @@ event zeek_init()
{ {
local make_epoch_result = function(pass_name: string): function(ts: time): time local make_epoch_result = function(pass_name: string): function(ts: time): time
{ {
@if ( Version::at_least("4.1") )
return function [pass_name] (ts: time): time return function [pass_name] (ts: time): time
@else
return function (ts: time)
@endif
{ {
print pass_name; print pass_name;
return ts; return ts;
@ -35,11 +31,7 @@ event zeek_init()
{ {
local make_epoch_result = function(pass_name: string): function(ts: time): time local make_epoch_result = function(pass_name: string): function(ts: time): time
{ {
@if ( Version::at_least("4.1") )
return function [pass_name] (ts: time): time { return function [pass_name] (ts: time): time {
@else
return function (ts: time) {
@endif
print pass_name; print pass_name;
return ts; return ts;
}; };

2
testing/btest/scripts/policy/frameworks/dpd/packet-segment-logging.zeek
View file

@ -9,10 +9,8 @@ event analyzer_violation(c: connection, atype: AllAnalyzers::Tag, aid: count, re
print "analyzer_violation", c$id, atype, aid, reason; print "analyzer_violation", c$id, atype, aid, reason;
} }
@if ( Version::at_least("5.1") )
event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo) event analyzer_violation_info(tag: AllAnalyzers::Tag, info: AnalyzerViolationInfo)
{ {
print "reason", info$reason; print "reason", info$reason;
print "data", fmt("%s", info$data); print "data", fmt("%s", info$data);
} }
@endif

1
testing/btest/supervisor/config-cluster-pcap.zeek
View file

@ -1,4 +1,5 @@
# @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig # @TEST-DOC: Test support for pcap_file on Supervisor::ClusterEndpoint and Supervisor::NodeConfig
# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
# #
# @TEST-PORT: MANAGER_PORT # @TEST-PORT: MANAGER_PORT
# @TEST-PORT: WORKER_PORT # @TEST-PORT: WORKER_PORT