summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-28 15:19:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-28 15:19:25 +0200
commitba6be8f30789efe84dc9582e7fc2a117cb447caa (patch)
tree46658d41f4c38aa16a267124b5ddb4ff0dd62cc8
parent35ea061f62cf0cbae074b2df47dc6b462da4fd20 (diff)
parent5514acb7eeaca41f1fd196402ef08efc55bce11c (diff)
downloadrsyslog-ba6be8f30789efe84dc9582e7fc2a117cb447caa.tar.gz
rsyslog-ba6be8f30789efe84dc9582e7fc2a117cb447caa.tar.xz
rsyslog-ba6be8f30789efe84dc9582e7fc2a117cb447caa.zip
Merge branch 'diag'
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/diag.sh5
-rw-r--r--tests/testsuites/diskqueue.conf2
-rw-r--r--tests/testsuites/imtcp-multiport.conf2
-rw-r--r--tests/testsuites/manytcp.conf2
-rw-r--r--tests/testsuites/queue-persist.conf2
6 files changed, 8 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 713c721e..7a7b8147 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/1.inputname_imtcp_12516 \
omod-if-array.sh \
diag.sh \
+ testsuites/diag-common.conf \
queue-persist.sh \
queue-persist-drvr.sh \
testsuites/queue-persist.conf \
diff --git a/tests/diag.sh b/tests/diag.sh
index 270b30d6..ec2c1190 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -7,15 +7,16 @@
# This file is part of the rsyslog project, released under GPLv3
#set -o xtrace
#export RSYSLOG_DEBUG="debug nostdout"
-#export RSYSLOG_DEBUGLOG="tmp"
+#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
rm -f rsyslogd.started work-*.conf
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
rm -rf test-spool
mkdir test-spool
;;
- 'exit') rm -f rsyslogd.started work-*.conf
+ 'exit') rm -f rsyslogd.started work-*.conf diag-common.conf
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
rm -rf test-spool
;;
diff --git a/tests/testsuites/diskqueue.conf b/tests/testsuites/diskqueue.conf
index d7f323bc..a992c5a5 100644
--- a/tests/testsuites/diskqueue.conf
+++ b/tests/testsuites/diskqueue.conf
@@ -1,6 +1,6 @@
# Test for queue disk mode (see .sh file for details)
# rgerhards, 2009-04-17
-$IncludeConfig testsuites/diag-common.conf
+$IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/imtcp-multiport.conf b/tests/testsuites/imtcp-multiport.conf
index 9146f6e0..ccdc15fb 100644
--- a/tests/testsuites/imtcp-multiport.conf
+++ b/tests/testsuites/imtcp-multiport.conf
@@ -1,6 +1,6 @@
# Test for queue disk mode (see .sh file for details)
# rgerhards, 2009-05-22
-$IncludeConfig testsuites/diag-common.conf
+$IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/manytcp.conf b/tests/testsuites/manytcp.conf
index 772ec9ce..eb9db257 100644
--- a/tests/testsuites/manytcp.conf
+++ b/tests/testsuites/manytcp.conf
@@ -1,6 +1,6 @@
# Test for tcp "flood" testing
# rgerhards, 2009-04-08
-$IncludeConfig testsuites/diag-common.conf
+$IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000
diff --git a/tests/testsuites/queue-persist.conf b/tests/testsuites/queue-persist.conf
index 80f8ba30..81ee1be5 100644
--- a/tests/testsuites/queue-persist.conf
+++ b/tests/testsuites/queue-persist.conf
@@ -1,6 +1,6 @@
# Test for persisting messages on shutdown
# rgerhards, 2009-04-17
-$IncludeConfig testsuites/diag-common.conf
+$IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 1