summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-14 14:37:40 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-14 14:37:40 +0100
commit8ca7467ed408965b44864b507e734e209d35338a (patch)
tree07c049cd8789addebc6a269fa4ab80ae6055cdda /tests
parent48c0875b15fac19d06ebcfb5902ab35c0f1f112e (diff)
downloadrsyslog-8ca7467ed408965b44864b507e734e209d35338a.tar.gz
rsyslog-8ca7467ed408965b44864b507e734e209d35338a.tar.xz
rsyslog-8ca7467ed408965b44864b507e734e209d35338a.zip
fixed double-free regerssion, probably caused by last merge
Diffstat (limited to 'tests')
-rwxr-xr-xtests/diag.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index 55eb4f8d..b8b55f11 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -41,7 +41,7 @@ case $1 in
;;
'startup-vg') # start rsyslogd with default params under valgrind control. $2 is the config file name to use
# returns only after successful startup, $3 is the instance (blank or 2!)
- valgrind --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
+ valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
$srcdir/diag.sh wait-startup $3
;;
'wait-startup') # wait for rsyslogd startup ($2 is the instance)