rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-13 07:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench: mmdb valgrind tests failed is srcdir env was not set

Browse Source
This commit is contained in:
Rainer Gerhards 2019-01-28 16:11:05 +01:00
parent c533db69e4
commit 12ab63ba59
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/mmdb-multilevel-vg.sh
View File

@ -1,11 +1,9 @@
#!/bin/bash
# This file is part of the rsyslog project, released under ASL 2.0
. ${srcdir:=.}/diag.sh init
# we libmaxmindb, in packaged versions, has a small cosmetic memory leak,
# thus we need a supressions file:
export RS_TESTBENCH_VALGRIND_EXTRA_OPTS="$RS_TESTBENCH_VALGRIND_EXTRA_OPTS --suppressions=$srcdir/libmaxmindb.supp"
. ${srcdir:=.}/diag.sh init
generate_conf
add_conf '
template(name="outfmt" type="string" string="%$!iplocation%\n")
@ -16,12 +14,12 @@ module(load="../plugins/imptcp/.libs/imptcp")
input(type="imptcp" port="'$TCPFLOOD_PORT'" ruleset="testing")
ruleset(name="testing") {
action(type="mmnormalize" rulebase=`echo $srcdir/mmdb.rb`)
action(type="mmnormalize" rulebase="'$srcdir'/mmdb.rb")
# Uncomment this action when using the real GeoLite2 city database;
# we have not included it into the testbench for licensing concerns.
# action(type="mmdblookup" mmdbfile="/home/USR/GeoLite2-City_20170502/GeoLite2-City.mmdb" key="$!ip" fields=":city:!city!names!en" )
action(type="mmdblookup" mmdbfile=`echo $srcdir/test.mmdb` key="$!ip" fields=":city_name:city" )
action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
action(type="mmdblookup" mmdbfile="'$srcdir'/test.mmdb" key="$!ip" fields=":city_name:city" )
action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
}'
startup_vg
tcpflood -m 100 -j "202.106.0.20\ "

10
tests/mmdb-vg.sh
View File

@ -1,11 +1,9 @@
#!/bin/bash
# This file is part of the rsyslog project, released under ASL 2.0
. ${srcdir:=.}/diag.sh init
# we libmaxmindb, in packaged versions, has a small cosmetic memory leak,
# thus we need a supressions file:
export RS_TESTBENCH_VALGRIND_EXTRA_OPTS="$RS_TESTBENCH_VALGRIND_EXTRA_OPTS --suppressions=$srcdir/libmaxmindb.supp"
. ${srcdir:=.}/diag.sh init
generate_conf
add_conf '
template(name="outfmt" type="string" string="%$!iplocation%\n")
@ -16,9 +14,9 @@ module(load="../plugins/imptcp/.libs/imptcp")
input(type="imptcp" port="'$TCPFLOOD_PORT'" ruleset="testing")
ruleset(name="testing") {
action(type="mmnormalize" rulebase=`echo $srcdir/mmdb.rb`)
action(type="mmdblookup" mmdbfile=`echo $srcdir/test.mmdb` key="$!ip" fields="city" )
action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
action(type="mmnormalize" rulebase="'$srcdir'/mmdb.rb")
action(type="mmdblookup" mmdbfile="'$srcdir'/test.mmdb" key="$!ip" fields="city" )
action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
}'
startup_vg
tcpflood -m 100 -j "202.106.0.20\ "