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

Fixing remaining tests.

Browse source
This commit is contained in:
Robin Sommer 2014-09-04 20:55:20 -07:00
parent 6e33c92cf0
commit 042afd2feb
9 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 181f084432e277f899140647d9b788059b3cccb1
Subproject commit 4bb294d4d15b14a9e49f875b459fdef8286b5957

2
cmake

@ -1 +1 @@
Subproject commit aa15263ae39667e5e9bd73690b05aa4af9147ca3
Subproject commit 4f830a0fbf078d6b64a9a2264d2d06d89e8fe619

2
src/iosource/Component.cc
View file

@ -151,7 +151,7 @@ void PktDumperComponent::DoDescribe(ODesc* d) const
if ( prefs.size() )
prefs += ", ";
prefs += *i;
prefs += '"' + *i + '"';
}
d->Add("dumper prefix");

4
src/iosource/IOSource.h
View file

@ -3,6 +3,10 @@
#ifndef IOSOURCE_IOSOURCE_H
#define IOSOURCE_IOSOURCE_H
extern "C" {
#include <pcap.h>
}
#include <string>
#include "Timer.h"

4
src/iosource/PktSrc.h
View file

@ -3,10 +3,6 @@
#ifndef IOSOURCE_PKTSRC_PKTSRC_H
#define IOSOURCE_PKTSRC_PKTSRC_H
extern "C" {
#include <pcap.h>
}
#include "IOSource.h"
#include "BPF_Program.h"
#include "Dict.h"

2
testing/btest/Baseline/plugins.bifs-and-scripts-install/output
View file

@ -1,6 +1,6 @@
Demo::Foo - <Insert description> (dynamic, version 1.0)
[Event] plugin_event
[Function] hello_plugin_world
[Event] plugin_event
plugin: automatically loaded at startup
calling bif, Hello from the plugin!

2
testing/btest/Baseline/plugins.bifs-and-scripts/output
View file

@ -1,6 +1,6 @@
Demo::Foo - <Insert description> (dynamic, version 1.0)
[Event] plugin_event
[Function] hello_plugin_world
[Event] plugin_event
===
plugin: automatically loaded at startup

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

@ -1,12 +1,14 @@
# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin Demo Foo
# @TEST-EXEC: bash %INPUT
# @TEST-EXEC: ./configure --bro-dist=${DIST}
# @TEST-EXEC: BRO_PLUGIN_INSTALL=`pwd`/test-install make
# @TEST-EXEC: ./configure --bro-dist=${DIST} --install-root=`pwd`/test-install
# @TEST-EXEC: make
# @TEST-EXEC: make install
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro demo/foo -r $TRACES/empty.trace >>output
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
mkdir -p scripts/demo/foo/base/
cat >scripts/__load__.bro <<EOF
@load ./demo/foo/base/at-startup.bro
EOF
@ -22,8 +24,6 @@ event bro_init() &priority=-10
}
EOF
mkdir -p scripts/demo/foo/base/
cat >scripts/demo/foo/base/at-startup.bro <<EOF
event bro_init() &priority=10
{
@ -32,17 +32,16 @@ event bro_init() &priority=10
}
EOF
cat >src/functions.bif <<EOF
cat >src/foo.bif <<EOF
function hello_plugin_world%(%): string
%{
return new StringVal("Hello from the plugin!");
%}
event plugin_event%(foo: count%);
EOF
cat >activate.bro <<EOF
@load-plugin Demo::Foo
EOF
cat >src/events.bif <<EOF
event plugin_event%(foo: count%);
EOF

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

@ -23,6 +23,8 @@
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
mkdir -p scripts/demo/foo/base/
cat >scripts/__load__.bro <<EOF
@load ./demo/foo/base/at-startup.bro
EOF
@ -38,8 +40,6 @@ event bro_init() &priority=-10
}
EOF
mkdir -p scripts/demo/foo/base/
cat >scripts/demo/foo/base/at-startup.bro <<EOF
event bro_init() &priority=10
{
@ -48,17 +48,16 @@ event bro_init() &priority=10
}
EOF
cat >src/functions.bif <<EOF
cat >src/foo.bif <<EOF
function hello_plugin_world%(%): string
%{
return new StringVal("Hello from the plugin!");
%}
event plugin_event%(foo: count%);
EOF
cat >activate.bro <<EOF
@load-plugin Demo::Foo
EOF
cat >src/events.bif <<EOF
event plugin_event%(foo: count%);
EOF