summaryrefslogtreecommitdiffstats
path: root/tests/linkedlistqueue.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-27 12:52:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-27 12:52:28 +0200
commitaffa217cc2d22fa8037a50b8d40d3372694ff855 (patch)
treecc330c7bca3053117bab0855dcf0e6fc0d2e4bec /tests/linkedlistqueue.sh
parent33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (diff)
downloadrsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.gz
rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.xz
rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.zip
adapted testbench to new capabilities
... and now make check fails again, we have obviously found some new bugs thanks to the additional cases
Diffstat (limited to 'tests/linkedlistqueue.sh')
-rwxr-xr-xtests/linkedlistqueue.sh28
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/linkedlistqueue.sh b/tests/linkedlistqueue.sh
index aa574bd1..9570ed2b 100755
--- a/tests/linkedlistqueue.sh
+++ b/tests/linkedlistqueue.sh
@@ -2,25 +2,13 @@
# added 2009-05-20 by rgerhards
# This file is part of the rsyslog project, released under GPLv3
echo testing queue Linkedlist queue mode
-rm -f work rsyslog.out.log
-# enable this, if you need debug output: export RSYSLOG_DEBUG="debug"
-../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/arrayqueue.conf &
-sleep 1
-echo "rsyslogd started with pid " `cat rsyslog.pid`
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup linkedlistqueue.conf
+
# 40000 messages should be enough
-./tcpflood 127.0.0.1 13514 1 40000
-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
-sleep 4 # we need this so that rsyslogd can receive all outstanding messages
+source $srcdir/diag.sh injectmsg 0 40000
+
+# terminate *now* (don't wait for queue to drain)
kill `cat rsyslog.pid`
-rm -f work
-sort < rsyslog.out.log > work
-./chkseq -fwork -e39999
-if [ "$?" -ne "0" ]; then
- # rm -f work rsyslog.out.log
- echo "sequence error detected"
- exit 1
-fi
-rm -f work rsyslog.out.log
+source $srcdir/diag.sh seq-check 0 39999
+source $srcdir/diag.sh exit