diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
commit | 2fc70320e303fd02b29469416a709a1f8ee4374d (patch) | |
tree | 9de5d8b20ad8d6e7a6d85c559056a68a68adff1e /tests/diag.sh | |
parent | 33366f2f1e271f47edeed75f69d9885171e61ea0 (diff) | |
parent | 9e18ecc9bd14093b78199fd36c315cfce4d26a26 (diff) | |
download | rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.gz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.xz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.zip |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/diag.sh')
-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 82ff4054..8fbe42ed 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -10,7 +10,7 @@ #valgrind="valgrind --tool=helgrind --log-fd=1" #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nostdout" +#export RSYSLOG_DEBUG="debug nologfuncflow nostdout" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason @@ -31,7 +31,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir rm -f rsyslog.out.*.log rsyslog.random.data work-presort rsyslog.pipe - rm -f rsyslog.input + rm -f rsyslog.input stat-file1 echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use |