summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-10-23 00:53:27 +0200
committerMichael Biebl <biebl@debian.org>2012-10-23 00:53:27 +0200
commit30d3515e017ba4b2d74c55c2ad7b897b8a9eb020 (patch)
tree4a4a004202652e61d4c9a7dd3f8597321377856c /tests
parent9e3cfcd680648a9905180bcc01b1d61522c5666f (diff)
downloadrsyslog-30d3515e017ba4b2d74c55c2ad7b897b8a9eb020.tar.gz
Imported Upstream version 7.2.0upstream/7.2.0
Diffstat (limited to 'tests')
-rwxr-xr-xtests/diag.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/diag.sh b/tests/diag.sh
index b278d2c..bd38b29 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -36,12 +36,12 @@ case $1 in
;;
'startup') # start rsyslogd with default params. $2 is the config file name to use
# returns only after successful startup, $3 is the instance (blank or 2!)
- $valgrind ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
+ $valgrind ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
$srcdir/diag.sh wait-startup $3
;;
'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 --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 &
+ valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -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)