diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-21 17:38:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-21 17:38:53 +0100 |
| commit | d02bd7b837e6b0b47df797cf61a6a8eb80bace7c (patch) | |
| tree | bb62cdf03348446ffa8bbd3bccf47ee1a11f65d3 /tests | |
| parent | 5fe0bc6aea9e101692a98450703c9c3d00302d67 (diff) | |
| parent | b526e3d92f214aa2a3d0e3c2746884e9a9dba411 (diff) | |
| download | rsyslog-d02bd7b837e6b0b47df797cf61a6a8eb80bace7c.tar.gz rsyslog-d02bd7b837e6b0b47df797cf61a6a8eb80bace7c.tar.xz rsyslog-d02bd7b837e6b0b47df797cf61a6a8eb80bace7c.zip | |
Merge branch 'v4-devel'
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/diag.sh | 3 | ||||
| -rw-r--r-- | tests/diagtalker.c | 1 | ||||
| -rwxr-xr-x | tests/threadingmqaq.sh | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index b81e4eb6..0bcb34ce 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -39,6 +39,9 @@ case $1 in $srcdir/diag.sh wait-startup $3 ;; 'wait-startup') # wait for rsyslogd startup ($2 is the instance) + while test ! -f rsyslog$2.pid; do + ./msleep 100 # wait 100 milliseconds + done while test ! -f rsyslogd$2.started; do ./msleep 100 # wait 100 milliseconds done diff --git a/tests/diagtalker.c b/tests/diagtalker.c index f5fd1c40..6a721e47 100644 --- a/tests/diagtalker.c +++ b/tests/diagtalker.c @@ -65,6 +65,7 @@ int openConn(int *fd) fprintf(stderr, "connect() failed\n"); exit(1); } else { + fprintf(stderr, "connect failed, retrying...\n"); usleep(100000); /* ms = 1000 us! */ } } diff --git a/tests/threadingmqaq.sh b/tests/threadingmqaq.sh index 29047bea..ae5d3568 100755 --- a/tests/threadingmqaq.sh +++ b/tests/threadingmqaq.sh @@ -12,6 +12,9 @@ source $srcdir/diag.sh startup threadingmqaq.conf #source $srcdir/diag.sh tcpflood -c2 -m100000 #source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh injectmsg 0 100000 +# we need to sleep a bit on some environments, as imdiag can not correctly +# diagnose when the action queues are empty... +sleep 3 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh seq-check 0 99999 |