summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-04-12 11:48:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-04-12 11:48:09 +0200
commit92a782dd2fc85c233f7144d86970321f2bfee588 (patch)
tree06156dc4e1665a38cedf56d2c4fa4b4f2778b440 /tests
parent12a433e000cab7ab1737df479aefbaeccab0dc09 (diff)
parent9105946272e4190e042981f35994b3f044ebb0d3 (diff)
downloadrsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.gz
rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.xz
rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.zip
Merge branch 'v5-devel'
Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
Diffstat (limited to 'tests')
-rw-r--r--tests/testsuites/random.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/testsuites/random.conf b/tests/testsuites/random.conf
index a7079df1..74ec61a8 100644
--- a/tests/testsuites/random.conf
+++ b/tests/testsuites/random.conf
@@ -4,6 +4,11 @@
# rgerhards, 2010-04-01
$IncludeConfig diag-common.conf
+# The random data will generate TCP framing error messages. We will
+# not clutter the test output with them. So we disable error messages
+# to stderr.
+$ErrorMessagesToStderr off
+
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
$InputTCPServerRun 13514