rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 02:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v5-devel

Browse Source 
Conflicts:
	tests/Makefile.am
	tests/diag.sh
This commit is contained in:
Rainer Gerhards 2009-05-28 15:34:25 +02:00
commit 7860e4a393
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@ -68,6 +68,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
diag.sh \ diag.sh \
daqueue-persist.sh \ daqueue-persist.sh \
daqueue-persist-drvr.sh \ daqueue-persist-drvr.sh \
testsuites/diag-common.conf \
queue-persist.sh \ queue-persist.sh \
queue-persist-drvr.sh \ queue-persist-drvr.sh \
testsuites/queue-persist.conf \ testsuites/queue-persist.conf \

4
tests/diag.sh
View File

@ -13,13 +13,13 @@
#export RSYSLOG_DEBUGLOG="log" #export RSYSLOG_DEBUGLOG="log"
case $1 in case $1 in
'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason '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 rsyslogd.started work-*.conf
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
rm -rf test-spool rm -rf test-spool
mkdir 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 -f work rsyslog.out.log rsyslog.out.log.save # common work files
rm -rf test-spool rm -rf test-spool
;; ;;

2
tests/testsuites/diskqueue.conf
View File

@ -1,6 +1,6 @@
# Test for queue disk mode (see .sh file for details) # Test for queue disk mode (see .sh file for details)
# rgerhards, 2009-04-17 # rgerhards, 2009-04-17
$IncludeConfig testsuites/diag-common.conf $IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp $ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000 $MainMsgQueueTimeoutShutdown 10000

2
tests/testsuites/imtcp-multiport.conf
View File

@ -1,6 +1,6 @@
# Test for queue disk mode (see .sh file for details) # Test for queue disk mode (see .sh file for details)
# rgerhards, 2009-05-22 # rgerhards, 2009-05-22
$IncludeConfig testsuites/diag-common.conf $IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp $ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000 $MainMsgQueueTimeoutShutdown 10000

2
tests/testsuites/manytcp.conf
View File

@ -1,6 +1,6 @@
# Test for tcp "flood" testing # Test for tcp "flood" testing
# rgerhards, 2009-04-08 # rgerhards, 2009-04-08
$IncludeConfig testsuites/diag-common.conf $IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp $ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 10000 $MainMsgQueueTimeoutShutdown 10000

2
tests/testsuites/queue-persist.conf
View File

@ -1,6 +1,6 @@
# Test for persisting messages on shutdown # Test for persisting messages on shutdown
# rgerhards, 2009-04-17 # rgerhards, 2009-04-17
$IncludeConfig testsuites/diag-common.conf $IncludeConfig diag-common.conf
$ModLoad ../plugins/imtcp/.libs/imtcp $ModLoad ../plugins/imtcp/.libs/imtcp
$MainMsgQueueTimeoutShutdown 1 $MainMsgQueueTimeoutShutdown 1