diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:20:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 12:20:18 +0200 |
| commit | 6bfc397b09eab1269a718f1bf661bb31cadd626b (patch) | |
| tree | 63d4e503a3cceef724397e08b81d5afe6ae1f05b /tests | |
| parent | 163acd9d9fd5e01975e99ad26af8a9c8097b3260 (diff) | |
| download | rsyslog-6bfc397b09eab1269a718f1bf661bb31cadd626b.tar.gz rsyslog-6bfc397b09eab1269a718f1bf661bb31cadd626b.tar.bz2 rsyslog-6bfc397b09eab1269a718f1bf661bb31cadd626b.zip | |
preparing for 6.6.0v6.6.0
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/diag.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index b278d2c5..bd38b29d 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) |