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

Fix unit test failures on case-insensitive file systems

Browse source 
The original casing mistake in the test only pops up now due to the
new .zeek over .bro file loading preference
This commit is contained in:
Jon Siwek 2019-04-17 16:44:16 -07:00
parent 31e9ae0fed
commit 5f3e608b60
4 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-230 | 2019-04-17 16:44:16 -0700
* Fix unit test failures on case-insensitive file systems (Jon Siwek, Corelight)
2.6-227 | 2019-04-16 17:44:31 -0700 2.6-227 | 2019-04-16 17:44:31 -0700
* GH-237: add `@load foo.bro` -> foo.zeek fallback (Jon Siwek, Corelight) * GH-237: add `@load foo.bro` -> foo.zeek fallback (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.6-227 2.6-230

16
testing/btest/plugins/bifs-and-scripts-install.sh
View file

@ -4,20 +4,20 @@
# @TEST-EXEC: make # @TEST-EXEC: make
# @TEST-EXEC: make install # @TEST-EXEC: make install
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro demo/foo -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro Demo/Foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
mkdir -p scripts/demo/foo/base/ mkdir -p scripts/Demo/Foo/base/
cat >scripts/__load__.zeek <<EOF cat >scripts/__load__.zeek <<EOF
@load ./demo/foo/base/at-startup.bro @load ./Demo/Foo/base/at-startup.zeek
EOF EOF
cat >scripts/demo/foo/__load__.bro <<EOF cat >scripts/Demo/Foo/__load__.zeek <<EOF
@load ./manually.bro @load ./manually.zeek
EOF EOF
cat >scripts/demo/foo/manually.bro <<EOF cat >scripts/Demo/Foo/manually.zeek <<EOF
event bro_init() &priority=-10 event bro_init() &priority=-10
{ {
print "plugin: manually loaded"; print "plugin: manually loaded";
@ -25,7 +25,7 @@ event bro_init() &priority=-10
} }
EOF EOF
cat >scripts/demo/foo/base/at-startup.bro <<EOF cat >scripts/Demo/Foo/base/at-startup.zeek <<EOF
event bro_init() &priority=10 event bro_init() &priority=10
{ {
print "plugin: automatically loaded at startup"; print "plugin: automatically loaded at startup";
@ -41,7 +41,7 @@ function hello_plugin_world%(%): string
event plugin_event%(foo: count%); event plugin_event%(foo: count%);
EOF EOF
cat >activate.bro <<EOF cat >activate.zeek <<EOF
@load-plugin Demo::Foo @load-plugin Demo::Foo
EOF EOF

24
testing/btest/plugins/bifs-and-scripts.sh
View file

@ -6,34 +6,34 @@
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro demo/foo -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro Demo/Foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo =-= >>output # @TEST-EXEC: echo =-= >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo =-= >>output # @TEST-EXEC: echo =-= >>output
# @TEST-EXEC-FAIL: BRO_PLUGIN_PATH=`pwd` bro -b demo/foo -r $TRACES/empty.trace >>output # @TEST-EXEC-FAIL: BRO_PLUGIN_PATH=`pwd` bro -b Demo/Foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.bro -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.zeek -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.bro demo/foo -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.zeek Demo/Foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b Demo::Foo demo/foo -r $TRACES/empty.trace >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b Demo::Foo Demo/Foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
mkdir -p scripts/demo/foo/base/ mkdir -p scripts/Demo/Foo/base/
cat >scripts/__load__.zeek <<EOF cat >scripts/__load__.zeek <<EOF
@load ./demo/foo/base/at-startup.bro @load ./Demo/Foo/base/at-startup.zeek
EOF EOF
cat >scripts/demo/foo/__load__.bro <<EOF cat >scripts/Demo/Foo/__load__.zeek <<EOF
@load ./manually.bro @load ./manually.zeek
EOF EOF
cat >scripts/demo/foo/manually.bro <<EOF cat >scripts/Demo/Foo/manually.zeek <<EOF
event bro_init() &priority=-10 event bro_init() &priority=-10
{ {
print "plugin: manually loaded"; print "plugin: manually loaded";
@ -41,7 +41,7 @@ event bro_init() &priority=-10
} }
EOF EOF
cat >scripts/demo/foo/base/at-startup.bro <<EOF cat >scripts/Demo/Foo/base/at-startup.zeek <<EOF
event bro_init() &priority=10 event bro_init() &priority=10
{ {
print "plugin: automatically loaded at startup"; print "plugin: automatically loaded at startup";
@ -57,7 +57,7 @@ function hello_plugin_world%(%): string
event plugin_event%(foo: count%); event plugin_event%(foo: count%);
EOF EOF
cat >activate.bro <<EOF cat >activate.zeek <<EOF
@load-plugin Demo::Foo @load-plugin Demo::Foo
EOF EOF