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

test suite updates for expanded sort() BiF semantics (bools, doubles)

Browse source
This commit is contained in:
Vern Paxson 2021-02-25 17:01:33 -08:00
parent ab0b773522
commit 98ada4e419
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testing/btest/Baseline/bifs.sort/out
View file

@ -3,12 +3,14 @@
[2, 3, 5, 8] [2, 3, 5, 8]
[-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days] [-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days]
[-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days] [-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days]
[T, F, F, T]
[T, F, F, T]
[F, F, T, T] [F, F, T, T]
[F, F, T, T] [F, F, T, T]
[57/tcp, 123/tcp, 7/udp, 500/udp, 12/icmp] [12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp]
[57/tcp, 123/tcp, 7/udp, 500/udp, 12/icmp] [12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp]
[3.03, 3.01, 3.02, 3.015] [3.01, 3.015, 3.02, 3.03]
[3.03, 3.01, 3.02, 3.015] [3.01, 3.015, 3.02, 3.03]
[192.168.123.200, 10.0.0.157, 192.168.0.3] [192.168.123.200, 10.0.0.157, 192.168.0.3]
[192.168.123.200, 10.0.0.157, 192.168.0.3] [192.168.123.200, 10.0.0.157, 192.168.0.3]
[10.0.0.157, 192.168.0.3, 192.168.123.200] [10.0.0.157, 192.168.0.3, 192.168.123.200]

18
testing/btest/bifs/sort.zeek
View file

@ -20,6 +20,16 @@ function myfunc2(a: double, b: double): int
return 1; return 1;
} }
function myfunc3(a: bool, b: bool): int
{
if (a == b)
return 0;
else if (a)
return 1;
else
return -1;
}
event zeek_init() event zeek_init()
{ {
# Tests without supplying a comparison function # Tests without supplying a comparison function
@ -34,17 +44,23 @@ event zeek_init()
print a2; print a2;
print b2; print b2;
# this one is expected to fail (i.e., "sort" doesn't sort the vector)
local a3: vector of bool = vector( T, F, F, T ); local a3: vector of bool = vector( T, F, F, T );
local b3 = sort(a3); local b3 = sort(a3);
print a3; print a3;
print b3; print b3;
local a3x: vector of bool = vector( T, F, F, T );
local b3x = sort(a3x, myfunc3);
print a3x;
print b3x;
# this one is expected to fail (i.e., "sort" doesn't sort the vector)
local a4: vector of port = vector( 12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp ); local a4: vector of port = vector( 12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp );
local b4 = sort(a4); local b4 = sort(a4);
print a4; print a4;
print b4; print b4;
# this one is expected to fail (i.e., "sort" doesn't sort the vector)
local a5: vector of double = vector( 3.03, 3.01, 3.02, 3.015 ); local a5: vector of double = vector( 3.03, 3.01, 3.02, 3.015 );
local b5 = sort(a5); local b5 = sort(a5);
print a5; print a5;