summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-11 16:51:30 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-11 16:51:30 +0200
commitcefa1fac08d4d67a4139146016fef206d59d5ddc (patch)
treec269d3cfbeca3cff0d9d6065c38ce0a5bd5f924b /tests
parent05ff79aa1f928e42bf9883e946923353eb2925ac (diff)
downloadrsyslog-cefa1fac08d4d67a4139146016fef206d59d5ddc.tar.gz
rsyslog-cefa1fac08d4d67a4139146016fef206d59d5ddc.tar.xz
rsyslog-cefa1fac08d4d67a4139146016fef206d59d5ddc.zip
fixed lexer: facilities local0-local7 were not correctly handled
Diffstat (limited to 'tests')
-rwxr-xr-xtests/diag.sh4
-rwxr-xr-xtests/imtcp_conndrop.sh1
-rw-r--r--tests/testsuites/imtcp_conndrop.conf1
3 files changed, 2 insertions, 4 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index 1f7de2cf..f2bcc4b8 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -10,8 +10,8 @@
#valgrind="valgrind --tool=helgrind --log-fd=1"
#valgrind="valgrind --tool=exp-ptrcheck --log-fd=1"
#set -o xtrace
-#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout"
-#export RSYSLOG_DEBUGLOG="log"
+export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout"
+export RSYSLOG_DEBUGLOG="log"
case $1 in
'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
cp $srcdir/testsuites/diag-common.conf diag-common.conf
diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh
index 0bfcd99c..c5073924 100755
--- a/tests/imtcp_conndrop.sh
+++ b/tests/imtcp_conndrop.sh
@@ -4,7 +4,6 @@
# This file is part of the rsyslog project, released under GPLv3
echo ====================================================================================
echo TEST: \[imtcp_conndrop.sh\]: test imtcp with random connection drops
-cat rsyslog.action.1.include
source $srcdir/diag.sh init
source $srcdir/diag.sh startup imtcp_conndrop.conf
# 100 byte messages to gain more practical data use
diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf
index b64f132b..de41bc43 100644
--- a/tests/testsuites/imtcp_conndrop.conf
+++ b/tests/testsuites/imtcp_conndrop.conf
@@ -12,5 +12,4 @@ $template dynfile,"rsyslog.out.log" # trick to use relative path names!
$OMFileFlushOnTXEnd off
$OMFileFlushInterval 2
$OMFileIOBufferSize 256k
-$IncludeConfig rsyslog.action.1.include
local0.* ?dynfile;outfmt