summaryrefslogtreecommitdiffstats
path: root/tests/testsuites
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:31:37 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:31:37 +0100
commit6a99be469643ef0214729391f9cef4867b8e9fca (patch)
tree3ae549560d49a2fa2f7db507f561562f3f6a7594 /tests/testsuites
parenta5cd509be736fcff3c8ae3104712d2fe85776416 (diff)
downloadrsyslog-6a99be469643ef0214729391f9cef4867b8e9fca.tar.gz
rsyslog-6a99be469643ef0214729391f9cef4867b8e9fca.tar.xz
rsyslog-6a99be469643ef0214729391f9cef4867b8e9fca.zip
added pipe action test to testbench & testbench bugfix
Diffstat (limited to 'tests/testsuites')
-rw-r--r--tests/testsuites/pipeaction.conf16
-rw-r--r--tests/testsuites/threadingmq.conf6
-rw-r--r--tests/testsuites/threadingmqaq.conf4
3 files changed, 17 insertions, 9 deletions
diff --git a/tests/testsuites/pipeaction.conf b/tests/testsuites/pipeaction.conf
new file mode 100644
index 00000000..f58b6d65
--- /dev/null
+++ b/tests/testsuites/pipeaction.conf
@@ -0,0 +1,16 @@
+# Test for pipe output action (see .sh file for details)
+# rgerhards, 2009-11-05
+$IncludeConfig diag-common.conf
+
+$MainMsgQueueTimeoutShutdown 10000
+
+# set spool locations and switch queue to disk-only mode
+$WorkDirectory test-spool
+$MainMsgQueueFilename mainq
+$MainMsgQueueType disk
+
+$template outfmt,"%msg:F,58:2%\n"
+# with pipes, we do not need to use absolute path names, so
+# we can simply refer to our working pipe via the usual relative
+# path name
+:msg, contains, "msgnum:" |rsyslog-testbench-fifo;outfmt
diff --git a/tests/testsuites/threadingmq.conf b/tests/testsuites/threadingmq.conf
index aa5197bb..b98f9b5a 100644
--- a/tests/testsuites/threadingmq.conf
+++ b/tests/testsuites/threadingmq.conf
@@ -3,11 +3,7 @@
# rgerhards, 2009-06-26
$IncludeConfig diag-common.conf
-$ModLoad ../plugins/imtcp/.libs/imtcp
-$MainMsgQueueTimeoutShutdown 10000
-$MaxOpenFiles 2000
-$InputTCPMaxSessions 1100
-$InputTCPServerRun 13514
+$MainMsgQueueTimeoutShutdown 100000
$MainMsgQueueWorkerThreadMinimumMessages 10
$MainMsgQueueWorkerThreads 5
diff --git a/tests/testsuites/threadingmqaq.conf b/tests/testsuites/threadingmqaq.conf
index f1bb72df..f0d39057 100644
--- a/tests/testsuites/threadingmqaq.conf
+++ b/tests/testsuites/threadingmqaq.conf
@@ -3,11 +3,7 @@
# rgerhards, 2009-06-26
$IncludeConfig diag-common.conf
-$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
-$MaxOpenFiles 2000
-$InputTCPMaxSessions 1100
-$InputTCPServerRun 13514
$MainMsgQueueWorkerThreadMinimumMessages 10
$MainMsgQueueWorkerThreads 5