From b526e3d92f214aa2a3d0e3c2746884e9a9dba411 Mon Sep 17 00:00:00 2001
From: Super-User <root@unknown.(none)>
Date: Wed, 21 Apr 2010 17:36:03 +0100
Subject: bugfix: some race condition in testbench on Solaris/Sparc

---
 tests/diag.sh          | 3 +++
 tests/diagtalker.c     | 1 +
 tests/threadingmqaq.sh | 3 +++
 3 files changed, 7 insertions(+)

(limited to 'tests')

diff --git a/tests/diag.sh b/tests/diag.sh
index 83d5b561..1caf529f 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -37,6 +37,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 b7764821..0104be00 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
-- 
cgit