diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 15:34:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 15:34:25 +0200 |
| commit | 7860e4a393995662e5f82f0ecbb84dd28c7f0297 (patch) | |
| tree | 9e98988a05a9777fda68546b2442bbebd0ceac18 | |
| parent | 13d4a23e92996e24d6a833ca75d06428c5387aa4 (diff) | |
| parent | ba6be8f30789efe84dc9582e7fc2a117cb447caa (diff) | |
| download | rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.tar.gz rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.tar.xz rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.zip | |
Merge branch 'master' into v5-devel
Conflicts:
tests/Makefile.am
tests/diag.sh
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/diag.sh | 4 | ||||
| -rw-r--r-- | tests/testsuites/diskqueue.conf | 2 | ||||
| -rw-r--r-- | tests/testsuites/imtcp-multiport.conf | 2 | ||||
| -rw-r--r-- | tests/testsuites/manytcp.conf | 2 | ||||
| -rw-r--r-- | tests/testsuites/queue-persist.conf | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 71daa3bc..14d15247 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,6 +68,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ diag.sh \ daqueue-persist.sh \ daqueue-persist-drvr.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 ce323143..1ceca75b 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -13,13 +13,13 @@ #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason - rm -f core.* vgcore.* # do NOT delete them at exit ;) + 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 4396c7bd..8903042d 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 |