summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-29 11:09:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-29 11:09:43 +0100
commit23c7a914b27ee0874208e0b9b70e4a13145f4ed0 (patch)
tree7a92952caa31559f4db50b0175d142df212a15c1
parentdd76d96d676f305aa2d29131321fe5cac5a676c4 (diff)
downloadrsyslog-23c7a914b27ee0874208e0b9b70e4a13145f4ed0.tar.gz
rsyslog-23c7a914b27ee0874208e0b9b70e4a13145f4ed0.tar.xz
rsyslog-23c7a914b27ee0874208e0b9b70e4a13145f4ed0.zip
solved some race condition in testbench
Note that this was NOT a race in rsyslog, but only one in a test case. So it had no implications to the correctness of rsyslogd.
-rwxr-xr-xtests/diskqueue-fsync.sh2
-rw-r--r--tests/tcpflood.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh
index 17b0ba4e..fe923c22 100755
--- a/tests/diskqueue-fsync.sh
+++ b/tests/diskqueue-fsync.sh
@@ -9,7 +9,7 @@ echo \[diskqueue-fsync.sh\]: testing queue disk-only mode, fsync case
source $srcdir/diag.sh init
source $srcdir/diag.sh startup diskqueue-fsync.conf
# 1000 messages should be enough - the disk fsync test is very slow!
-source $srcdir/diag.sh tcpflood -m1000
+source $srcdir/diag.sh injectmsg 0 1000
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 999
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index e92d1308..f93a87a2 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -471,6 +471,8 @@ int main(int argc, char *argv[])
exit(1);
}
+ closeConnections();
+
printf("End of tcpflood Run\n");
exit(ret);