diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 11:37:10 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 11:37:10 +0200 |
commit | 35ea061f62cf0cbae074b2df47dc6b462da4fd20 (patch) | |
tree | 08c0735b16914c998d54f5731e2669b82b14facf /tests/diskqueue.sh | |
parent | 78bc40e1af312d076c4cc2225c9281b6725217f6 (diff) | |
parent | 74ed599ea6ab96cffba35ca14f5654523f89bc61 (diff) | |
download | rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.tar.gz rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.tar.xz rsyslog-35ea061f62cf0cbae074b2df47dc6b462da4fd20.zip |
Merge branch 'diag'
Diffstat (limited to 'tests/diskqueue.sh')
-rwxr-xr-x | tests/diskqueue.sh | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh index eabfcf78..bf1a46fd 100755 --- a/tests/diskqueue.sh +++ b/tests/diskqueue.sh @@ -9,27 +9,10 @@ #export RSYSLOG_DEBUG="debug nostdout" #export RSYSLOG_DEBUGLOG="tmp" echo testing queue disk-only mode -rm -rf test-spool -mkdir test-spool -rm -f work rsyslog.out.log rsyslog.out.log.save # work files -../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/diskqueue.conf & -sleep 1 -echo "rsyslogd started with pid " `cat rsyslog.pid` +source $srcdir/diag.sh init +source $srcdir/diag.sh startup diskqueue.conf # 20000 messages should be enough - the disk test is slow enough ;) -./tcpflood 127.0.0.1 13514 1 20000 -if [ "$?" -ne "0" ]; then - echo "error during tcpflood! see rsyslog.out.log.save for what was written" - cp rsyslog.out.log rsyslog.out.log.save -fi -$srcdir/waitqueueempty.sh # wait until rsyslogd is done processing messages -kill `cat rsyslog.pid` -rm -f work -sort < rsyslog.out.log > work -./chkseq work 0 19999 -if [ "$?" -ne "0" ]; then - # rm -f work rsyslog.out.log - echo "sequence error detected" - exit 1 -fi -rm -f work rsyslog.out.log -rm -rf test-spool +source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 20000 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh seq-check 0 19999 +source $srcdir/diag.sh exit |