summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-06-25 11:18:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-06-25 11:18:13 +0200
commitba839bf17200f51a9860940910536fba2282161e (patch)
tree985ae6c752c19e3030bf5597f7880f609f944299
parente343346c1e63b9a0b18812138c15a3e7926ed162 (diff)
downloadrsyslog-ba839bf17200f51a9860940910536fba2282161e.tar.gz
rsyslog-ba839bf17200f51a9860940910536fba2282161e.tar.bz2
rsyslog-ba839bf17200f51a9860940910536fba2282161e.zip
testbench: "prevent" memleaks due to race
imdiag may not have enough time to properly terminate when the shutdown request is made. Thus we give it a little headroom. Note that this does not address a real issue inside the code - at most, it looks like a memory leak, but one where the whole process is immediately destructed. However, it is an annouance for the testbench. Note that the race may still occur based on circumstances, but now is much less likely.
-rwxr-xr-xtests/diag.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index 2fdcbfb9..7883d93b 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -109,6 +109,7 @@ case $1 in
echo Shutting down instance 2
fi
$srcdir/diag.sh wait-queueempty $2
+ ./msleep 100 # wait 100 milliseconds
kill `cat rsyslog$2.pid`
# note: we do not wait for the actual termination!
;;