mirror of
https://github.com/zeek/zeek.git
synced 2025-10-15 13:08:20 +00:00
Merge branch 'master' of https://github.com/zeek/zeek into topic/zeke/closures
This commit is contained in:
Zeke Medley
commit
f27209e84c
12 changed files with 268 additions and 73 deletions
28
testing/btest/Baseline/language.deprecated/no-warnings.out
Normal file
28
testing/btest/Baseline/language.deprecated/no-warnings.out
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
warning in ./no-warnings.zeek, line 27: deprecated (ONE)
|
||||
warning in ./no-warnings.zeek, line 28: deprecated (TWO)
|
||||
warning in ./no-warnings.zeek, line 30: deprecated (GREEN)
|
||||
warning in ./no-warnings.zeek, line 31: deprecated (BLUE)
|
||||
warning in ./no-warnings.zeek, line 33: deprecated (blah)
|
||||
warning in ./no-warnings.zeek, line 37: deprecated (my_event)
|
||||
warning in ./no-warnings.zeek, line 38: deprecated (my_event)
|
||||
warning in ./no-warnings.zeek, line 39: deprecated (my_hook)
|
||||
warning in ./no-warnings.zeek, line 41: deprecated (my_record$b)
|
||||
warning in ./no-warnings.zeek, line 42: deprecated (my_record$b)
|
||||
warning in ./no-warnings.zeek, line 43: deprecated (my_record$b)
|
||||
warning in ./no-warnings.zeek, line 45: deprecated (my_record?$b)
|
||||
warning in ./no-warnings.zeek, line 46: deprecated (my_record$b)
|
||||
warning in ./no-warnings.zeek, line 49: deprecated (my_record$b)
|
||||
warning in ./no-warnings.zeek, line 52: deprecated (my_event)
|
||||
warning in ./no-warnings.zeek, line 57: deprecated (my_hook)
|
||||
warning in ./no-warnings.zeek, line 62: deprecated (blah)
|
||||
warning in ./no-warnings.zeek, line 71: deprecated (dont_use_me)
|
||||
warning in ./no-warnings.zeek, line 76: deprecated (dont_use_me_either)
|
||||
ZERO
|
||||
ONE
|
||||
TWO
|
||||
RED
|
||||
GREEN
|
||||
BLUE
|
||||
generate my_hook please
|
||||
generate my_event please
|
||||
schedule my_event please
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 30: deprecated (ONE)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 31: deprecated (TWO)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 33: deprecated (GREEN)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 34: deprecated (BLUE)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 36: deprecated (blah)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 40: deprecated (my_event)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 41: deprecated (my_event)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 42: deprecated (my_hook)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 44: deprecated (my_record$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 45: deprecated (my_record$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 46: deprecated (my_record$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 48: deprecated (my_record?$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 49: deprecated (my_record$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 52: deprecated (my_record$b)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 55: deprecated (my_event)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 60: deprecated (my_hook)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 65: deprecated (blah)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 74: deprecated (dont_use_me)
|
||||
warning in /Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.deprecated/deprecated.zeek, line 79: deprecated (dont_use_me_either)
|
||||
ZERO
|
||||
ONE
|
||||
TWO
|
||||
RED
|
||||
GREEN
|
||||
BLUE
|
||||
generate my_hook please
|
||||
generate my_event please
|
||||
schedule my_event please
|
||||
28
testing/btest/Baseline/language.deprecated/warnings.out
Normal file
28
testing/btest/Baseline/language.deprecated/warnings.out
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
warning in ./warnings.zeek, line 27: deprecated (ONE): one warning
|
||||
warning in ./warnings.zeek, line 28: deprecated (TWO): two warning
|
||||
warning in ./warnings.zeek, line 30: deprecated (GREEN): green warning
|
||||
warning in ./warnings.zeek, line 31: deprecated (BLUE): red warning
|
||||
warning in ./warnings.zeek, line 33: deprecated (blah): type warning
|
||||
warning in ./warnings.zeek, line 37: deprecated (my_event): event warning
|
||||
warning in ./warnings.zeek, line 38: deprecated (my_event): event warning
|
||||
warning in ./warnings.zeek, line 39: deprecated (my_hook): hook warning
|
||||
warning in ./warnings.zeek, line 41: deprecated (my_record$b): record warning
|
||||
warning in ./warnings.zeek, line 42: deprecated (my_record$b): record warning
|
||||
warning in ./warnings.zeek, line 43: deprecated (my_record$b): record warning
|
||||
warning in ./warnings.zeek, line 45: deprecated (my_record?$b): record warning
|
||||
warning in ./warnings.zeek, line 46: deprecated (my_record$b): record warning
|
||||
warning in ./warnings.zeek, line 49: deprecated (my_record$b): record warning
|
||||
warning in ./warnings.zeek, line 52: deprecated (my_event): event warning
|
||||
warning in ./warnings.zeek, line 57: deprecated (my_hook): hook warning
|
||||
warning in ./warnings.zeek, line 62: deprecated (blah): type warning
|
||||
warning in ./warnings.zeek, line 71: deprecated (dont_use_me): global function warning
|
||||
warning in ./warnings.zeek, line 76: deprecated (dont_use_me_either): function warning
|
||||
ZERO
|
||||
ONE
|
||||
TWO
|
||||
RED
|
||||
GREEN
|
||||
BLUE
|
||||
generate my_hook please
|
||||
generate my_event please
|
||||
schedule my_event please
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
# @TEST-EXEC: zeek -b %INPUT >out 2>&1
|
||||
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
|
||||
# @TEST-EXEC: zeek -b no-warnings.zeek >no-warnings.out 2>&1
|
||||
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff no-warnings.out
|
||||
|
||||
# @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
|
||||
type blah: string &deprecated;
|
||||
|
||||
global my_event: event(arg: string) &deprecated;
|
||||
|
|
@ -21,7 +25,7 @@ type my_enum: enum {
|
|||
type my_other_enum: enum {
|
||||
ZERO = 0,
|
||||
ONE = 1 &deprecated,
|
||||
TWO = 2 &deprecated
|
||||
TWO = 2 &deprecated,
|
||||
};
|
||||
|
||||
event zeek_init()
|
||||
|
|
@ -78,3 +82,84 @@ function dont_use_me_either() &deprecated
|
|||
{
|
||||
dont_use_me_either();
|
||||
}
|
||||
@TEST-END-FILE
|
||||
|
||||
@TEST-START-FILE warnings.zeek
|
||||
type blah: string &deprecated="type warning";
|
||||
|
||||
global my_event: event(arg: string) &deprecated="event warning";
|
||||
|
||||
global my_hook: hook(arg: string) &deprecated="hook warning";
|
||||
|
||||
type my_record: record {
|
||||
a: count &default = 1;
|
||||
b: string &optional &deprecated="record warning";
|
||||
};
|
||||
|
||||
type my_enum: enum {
|
||||
RED,
|
||||
GREEN &deprecated="green warning",
|
||||
BLUE &deprecated="red warning"
|
||||
};
|
||||
|
||||
type my_other_enum: enum {
|
||||
ZERO = 0,
|
||||
ONE = 1 &deprecated="one warning",
|
||||
TWO = 2 &deprecated="two warning",
|
||||
};
|
||||
|
||||
event zeek_init()
|
||||
{
|
||||
print ZERO;
|
||||
print ONE;
|
||||
print TWO;
|
||||
print RED;
|
||||
print GREEN;
|
||||
print BLUE;
|
||||
|
||||
local l: blah = "testing";
|
||||
|
||||
local ls: string = " test";
|
||||
|
||||
event my_event("generate my_event please");
|
||||
schedule 1sec { my_event("schedule my_event please") };
|
||||
hook my_hook("generate my_hook please");
|
||||
|
||||
local mr = my_record($a = 3, $b = "yeah");
|
||||
mr = [$a = 4, $b = "ye"];
|
||||
mr = record($a = 5, $b = "y");
|
||||
|
||||
if ( ! mr?$b )
|
||||
mr$b = "nooooooo";
|
||||
|
||||
mr$a = 2;
|
||||
mr$b = "noooo";
|
||||
}
|
||||
|
||||
event my_event(arg: string)
|
||||
{
|
||||
print arg;
|
||||
}
|
||||
|
||||
hook my_hook(arg: string)
|
||||
{
|
||||
print arg;
|
||||
}
|
||||
|
||||
function hmm(b: blah)
|
||||
{
|
||||
print b;
|
||||
}
|
||||
|
||||
global dont_use_me: function() &deprecated="global function warning";
|
||||
|
||||
function dont_use_me()
|
||||
{
|
||||
dont_use_me();
|
||||
}
|
||||
|
||||
function dont_use_me_either() &deprecated="function warning"
|
||||
{
|
||||
dont_use_me_either();
|
||||
}
|
||||
@TEST-END-FILE
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue