diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:37:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-21 10:37:52 +0200 |
| commit | a4e5c7d4cca1c4fe42f5690dcd17195864c59f97 (patch) | |
| tree | 11cabf23c78b865b02e5f7f75e75d65769c4d1f6 /tests | |
| parent | 1bf76e99d61f7b62a6c7c52514ef7de0f1aebf81 (diff) | |
| parent | 90e8475260cf8ac54519b3d964d879489af879f6 (diff) | |
| download | rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.tar.gz rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.tar.xz rsyslog-a4e5c7d4cca1c4fe42f5690dcd17195864c59f97.zip | |
Merge branch 'newqueue'
Conflicts:
ChangeLog
runtime/queue.c
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/arrayqueue.sh | 4 | ||||
| -rwxr-xr-x | tests/daqueue-persist-drvr.sh | 11 | ||||
| -rwxr-xr-x | tests/inputname.sh | 2 | ||||
| -rwxr-xr-x | tests/queue-persist-drvr.sh | 1 |
4 files changed, 14 insertions, 4 deletions
diff --git a/tests/arrayqueue.sh b/tests/arrayqueue.sh index 58fd24ae..baf303f3 100755 --- a/tests/arrayqueue.sh +++ b/tests/arrayqueue.sh @@ -1,7 +1,7 @@ # Test for fixedArray queue mode # added 2009-05-20 by rgerhards # This file is part of the rsyslog project, released under GPLv3 -echo testing queue fixedArray queue mode +echo \[arrayqueue.sh\]: testing queue fixedArray queue mode source $srcdir/diag.sh init source $srcdir/diag.sh startup arrayqueue.conf @@ -13,5 +13,5 @@ kill `cat rsyslog.pid` # now wait until rsyslog.pid is gone (and the process finished) source $srcdir/diag.sh wait-shutdown -source $srcdir/diag.sh seq-check 0 39999 +source $srcdir/diag.sh seq-check 39999 source $srcdir/diag.sh exit diff --git a/tests/daqueue-persist-drvr.sh b/tests/daqueue-persist-drvr.sh index d95991fc..d36a6be5 100755 --- a/tests/daqueue-persist-drvr.sh +++ b/tests/daqueue-persist-drvr.sh @@ -12,6 +12,9 @@ source $srcdir/diag.sh init echo \$MainMsgQueueType $1 > work-queuemode.conf echo "*.* :omtesting:sleep 0 1000" > work-delay.conf +export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +export RSYSLOG_DEBUGLOG="log0" + # inject 10000 msgs, so that DO hit the high watermark source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh injectmsg 0 10000 @@ -19,13 +22,19 @@ $srcdir/diag.sh shutdown-immediate $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh check-mainq-spool +echo "Enter phase 2, rsyslogd restart" + #exit +export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +export RSYSLOG_DEBUGLOG="log" +#valgrind="valgrind --tool=helgrind --log-fd=1" + # restart engine and have rest processed #remove delay echo "#" > work-delay.conf source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages $srcdir/diag.sh wait-shutdown -source $srcdir/diag.sh seq-check 0 4999 +source $srcdir/diag.sh seq-check 0 99999 source $srcdir/diag.sh exit diff --git a/tests/inputname.sh b/tests/inputname.sh index e1a58517..71f11c1e 100755 --- a/tests/inputname.sh +++ b/tests/inputname.sh @@ -1,4 +1,4 @@ -echo testing $InputTCPServerInputName directive +echo \[inputname.sh\]: testing $InputTCPServerInputName directive $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason echo port 12514 diff --git a/tests/queue-persist-drvr.sh b/tests/queue-persist-drvr.sh index ea5386a7..53fbcb8b 100755 --- a/tests/queue-persist-drvr.sh +++ b/tests/queue-persist-drvr.sh @@ -24,5 +24,6 @@ source $srcdir/diag.sh check-mainq-spool echo "#" > work-delay.conf source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +$srcdir/diag.sh wait-shutdown source $srcdir/diag.sh seq-check 0 4999 source $srcdir/diag.sh exit |