summaryrefslogtreecommitdiffstats
path: root/tests/testsuites
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-27 12:52:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-27 12:52:28 +0200
commitaffa217cc2d22fa8037a50b8d40d3372694ff855 (patch)
treecc330c7bca3053117bab0855dcf0e6fc0d2e4bec /tests/testsuites
parent33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (diff)
downloadrsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.gz
rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.xz
rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.zip
adapted testbench to new capabilities
... and now make check fails again, we have obviously found some new bugs thanks to the additional cases
Diffstat (limited to 'tests/testsuites')
-rw-r--r--tests/testsuites/arrayqueue.conf4
-rw-r--r--tests/testsuites/da-mainmsg-q.conf2
-rw-r--r--tests/testsuites/linkedlistqueue.conf2
-rw-r--r--tests/testsuites/queue-persist.conf2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/testsuites/arrayqueue.conf b/tests/testsuites/arrayqueue.conf
index 7fdbc79b..44b9920b 100644
--- a/tests/testsuites/arrayqueue.conf
+++ b/tests/testsuites/arrayqueue.conf
@@ -1,11 +1,11 @@
# Test for queue fixedArray mode (see .sh file for details)
# rgerhards, 2009-04-17
+$IncludeConfig testsuites/diag-common.conf
+
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
$InputTCPServerRun 13514
-$ErrorMessagesToStderr off
-
# set spool locations and switch queue to disk-only mode
$MainMsgQueueType FixedArray
diff --git a/tests/testsuites/da-mainmsg-q.conf b/tests/testsuites/da-mainmsg-q.conf
index fbda27d4..c1e8cb01 100644
--- a/tests/testsuites/da-mainmsg-q.conf
+++ b/tests/testsuites/da-mainmsg-q.conf
@@ -4,7 +4,7 @@ $ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
$InputTCPServerRun 13514
-$ErrorMessagesToStderr off
+$IncludeConfig testsuites/diag-common.conf
# set spool locations and switch queue to disk assisted mode
$WorkDirectory test-spool
diff --git a/tests/testsuites/linkedlistqueue.conf b/tests/testsuites/linkedlistqueue.conf
index ecfc7a26..321678a5 100644
--- a/tests/testsuites/linkedlistqueue.conf
+++ b/tests/testsuites/linkedlistqueue.conf
@@ -1,5 +1,7 @@
# Test for queue LinkedList mode (see .sh file for details)
# rgerhards, 2009-04-17
+$IncludeConfig testsuites/diag-common.conf
+
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
$InputTCPServerRun 13514
diff --git a/tests/testsuites/queue-persist.conf b/tests/testsuites/queue-persist.conf
index 80f8ba30..4396c7bd 100644
--- a/tests/testsuites/queue-persist.conf
+++ b/tests/testsuites/queue-persist.conf
@@ -9,8 +9,6 @@ $InputTCPServerRun 13514
$ModLoad ../plugins/omtesting/.libs/omtesting
-$ErrorMessagesToStderr off
-
# set spool locations and switch queue to disk-only mode
$WorkDirectory test-spool
$MainMsgQueueFilename mainq