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

Remove support for .bro script extension and BRO_ environment variables

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-01-25 14:46:47 -07:00
parent 44ad614094
commit 725e759560
11 changed files with 33 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

1
testing/btest/Baseline/core.load-prefixes/output
View file

@ -1,5 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
loaded lcl2.base.utils.site.zeek
loaded lcl.base.utils.site.zeek
loaded lcl2.base.protocols.http.bro
loaded lcl.base.protocols.http.zeek

1
testing/btest/Baseline/core.load-unload/output2
View file

@ -1,2 +1 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
Loaded: dontloadme.bro

12
testing/btest/core/load-explicit-bro-suffix-fallback.zeek
View file

@ -1,12 +0,0 @@
# @TEST-EXEC: zeek -b %INPUT >out 2>&1
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
# We don't have a foo.bro, but we'll accept foo.zeek.
@load foo.bro
@TEST-START-FILE foo.zeek
event zeek_init()
{
print "loaded foo.zeek";
}
@TEST-END-FILE

33
testing/btest/core/load-file-extension.zeek
View file

@ -1,34 +1,11 @@
# Test loading scripts with different file extensions.
#
# Test that either ".zeek" or ".bro" can be loaded without specifying extension
# @TEST-EXEC: cp x/foo.bro .
# @TEST-EXEC: zeek -b load_foo > bro_only
# @TEST-EXEC: btest-diff bro_only
# @TEST-EXEC: rm foo.bro
#
# Test that ".zeek" can be loaded without specifying extension
# @TEST-EXEC: cp x/foo.zeek .
# @TEST-EXEC: zeek -b load_foo > zeek_only
# @TEST-EXEC: btest-diff zeek_only
# @TEST-EXEC: rm foo.zeek
#
# Test that ".zeek" is the preferred file extension, unless ".bro" is specified
# @TEST-EXEC: cp x/foo.* .
# @TEST-EXEC: cp x2/foo .
# @TEST-EXEC: zeek -b load_foo > zeek_preferred
# @TEST-EXEC: btest-diff zeek_preferred
#
# @TEST-EXEC: zeek -b load_foo_bro > bro_preferred
# @TEST-EXEC: btest-diff bro_preferred
# @TEST-EXEC: rm foo*
#
# Test that ".bro" is preferred over a script with no file extension (when
# there is no ".zeek" script)
# @TEST-EXEC: cp x/foo.bro .
# @TEST-EXEC: cp x2/foo .
# @TEST-EXEC: zeek -b load_foo > bro_preferred_2
# @TEST-EXEC: btest-diff bro_preferred_2
# @TEST-EXEC: rm foo*
#
# Test that a script with no file extension can be loaded
# @TEST-EXEC: cp x2/foo .
# @TEST-EXEC: zeek -b load_foo > no_extension
@ -55,19 +32,11 @@
@load foo
@TEST-END-FILE
@TEST-START-FILE load_foo_bro
@load foo.bro
@TEST-END-FILE
@TEST-START-FILE load_foo_xyz
@load foo.xyz
@TEST-END-FILE
@TEST-START-FILE x/foo.bro
print "Bro script loaded";
@TEST-END-FILE
@TEST-START-FILE x/foo.zeek
print "Zeek script loaded";
@TEST-END-FILE

14
testing/btest/core/load-pkg.zeek
View file

@ -1,23 +1,13 @@
# Test that package loading works when a package loader script is present.
#
# Test that ".zeek" is loaded when there is also a ".bro"
# Test that ".zeek" is loaded
# @TEST-EXEC: zeek -b foo >output
# @TEST-EXEC: btest-diff output
#
# Test that ".bro" is loaded when there is no ".zeek"
# @TEST-EXEC: rm foo/__load__.zeek
# @TEST-EXEC: zeek -b foo >output2
# @TEST-EXEC: btest-diff output2
#
# Test that package cannot be loaded when no package loader script exists.
# @TEST-EXEC: rm foo/__load__.bro
# @TEST-EXEC: rm foo/__load__.zeek
# @TEST-EXEC-FAIL: zeek -b foo
@TEST-START-FILE foo/__load__.bro
@load ./test
print "__load__.bro loaded";
@TEST-END-FILE
@TEST-START-FILE foo/__load__.zeek
@load ./test
print "__load__.zeek loaded";

7
testing/btest/core/load-prefixes.zeek
View file

@ -18,12 +18,7 @@ print "loaded lcl.base.utils.site.zeek";
print "loaded lcl2.base.utils.site.zeek";
@TEST-END-FILE
# For a script package like base/protocols/http/, either of the recognized
# file extensions can be loaded here.
# For a script package like base/protocols/http/, verify the package can be loaded.
@TEST-START-FILE lcl.base.protocols.http.zeek
print "loaded lcl.base.protocols.http.zeek";
@TEST-END-FILE
@TEST-START-FILE lcl2.base.protocols.http.bro
print "loaded lcl2.base.protocols.http.bro";
@TEST-END-FILE

11
testing/btest/core/load-unload.zeek
View file

@ -1,15 +1,9 @@
# This tests the @unload directive
#
# Test that @unload works with ".bro" when there is no ".zeek" script
# @TEST-EXEC: zeek -b unloadbro misc/loaded-scripts dontloadmebro > output
# @TEST-EXEC: zeek -b unload misc/loaded-scripts dontloadme > output
# @TEST-EXEC: btest-diff output
# @TEST-EXEC: grep dontloadmebro loaded_scripts.log && exit 1 || exit 0
#
# Test that @unload looks for ".zeek" first (assuming no file extension is
# specified in the @unload)
# @TEST-EXEC: zeek -b unload misc/loaded-scripts dontloadme.zeek dontloadme.bro > output2
# @TEST-EXEC: btest-diff output2
# @TEST-EXEC: grep dontloadme.bro loaded_scripts.log
# @TEST-EXEC: grep dontloadme loaded_scripts.log && exit 1 || exit 0
@TEST-START-FILE unloadbro.bro
@unload dontloadmebro
@ -30,3 +24,4 @@ print "Loaded: dontloadme.zeek";
@TEST-START-FILE dontloadme.bro
print "Loaded: dontloadme.bro";
@TEST-END-FILE
z