summaryrefslogtreecommitdiffstats
path: root/tests/diag.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-23 07:10:03 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-23 07:10:03 +0100
commitd2f242edcb25e69ae7de5a142229330070f2e70b (patch)
tree8f25fa8de784c877cda4c17452955234cdc2f95e /tests/diag.sh
parent396e211e5cfd195b7135947d425b089a0447fa88 (diff)
parent2f1d5a12037453792eb1000c79daf737b41c5ba4 (diff)
downloadrsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.tar.gz
rsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.tar.xz
rsyslog-d2f242edcb25e69ae7de5a142229330070f2e70b.zip
Merge branch 'v4-stable' into v4-stable-solaris
Diffstat (limited to 'tests/diag.sh')
-rwxr-xr-xtests/diag.sh24
1 files changed, 21 insertions, 3 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index f3d75a15..27b60582 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -8,6 +8,7 @@
#valgrind="valgrind --log-fd=1"
#valgrind="valgrind --tool=drd --log-fd=1"
#valgrind="valgrind --tool=helgrind --log-fd=1"
+#valgrind="valgrind --tool=exp-ptrcheck --log-fd=1"
#set -o xtrace
#export RSYSLOG_DEBUG="debug nostdout printmutexaction"
#export RSYSLOG_DEBUGLOG="log"
@@ -18,6 +19,7 @@ case $1 in
rm -f rsyslogd.started work-*.conf
rm -f rsyslogd2.started work-*.conf
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
+ rm -f rsyslog.out.*.log
rm -rf test-spool
rm -f core.* vgcore.*
mkdir test-spool
@@ -25,6 +27,7 @@ case $1 in
'exit') rm -f rsyslogd.started work-*.conf diag-common.conf
rm -f rsyslogd2.started diag-common2.conf
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
+ rm -f rsyslog.out.*.log
rm -rf test-spool
;;
'startup') # start rsyslogd with default params. $2 is the config file name to use
@@ -34,14 +37,16 @@ case $1 in
;;
'wait-startup') # wait for rsyslogd startup ($2 is the instance)
while test ! -f rsyslogd$2.started; do
- true
+ #true
+ sleep 0.1 # if this is not supported by all platforms, use above!
done
echo "rsyslogd$2 started with pid " `cat rsyslog$2.pid`
;;
'wait-shutdown') # actually, we wait for rsyslog.pid to be deleted. $2 is the
# instance
while test -f rsyslog$2.pid; do
- true
+ #true
+ sleep 0.1 # if this is not supported by all platforms, use above!
done
;;
'wait-queueempty') # wait for main message queue to be empty. $2 is the instance.
@@ -62,7 +67,7 @@ case $1 in
# note: we do not wait for the actual termination!
;;
'tcpflood') # do a tcpflood run and check if it worked params are passed to tcpflood
- ./tcpflood $2 $3 $4 $5 $6 $7 $8
+ ./tcpflood $2 $3 $4 $5 $6 $7 $8 $9
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
@@ -85,6 +90,7 @@ case $1 in
;;
'seq-check') # do the usual sequence check to see if everything was properly received. $2 is the instance.
rm -f work
+ cp rsyslog.out.log work-presort
sort < rsyslog.out.log > work
# $4... are just to have the abilit to pass in more options...
./chkseq -fwork -v -s$2 -e$3 $4 $5 $6 $7
@@ -105,6 +111,18 @@ case $1 in
exit 1
fi
;;
+ 'gzip-seq-check') # do the usual sequence check, but for gzip files
+ rm -f work
+ ls -l rsyslog.out.log
+ gunzip < rsyslog.out.log | sort > work
+ ls -l work
+ # $4... are just to have the abilit to pass in more options...
+ ./chkseq -fwork -v -s$2 -e$3 $4 $5 $6 $7
+ if [ "$?" -ne "0" ]; then
+ echo "sequence error detected"
+ exit 1
+ fi
+ ;;
'nettester') # perform nettester-based tests
# use -v for verbose output!
./nettester -t$2 -i$3