diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:11:21 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:11:21 +0200 |
commit | 242c263dc2eaa5c148d481503dae0498ee626103 (patch) | |
tree | 3d64994a124fdc5b9346c4bfef4e4d8938d50603 /tests/diag.sh | |
parent | d5f78989d8fd2a3c11fd1e6ed1cd4d688b1e6728 (diff) | |
parent | 86225089f2d0e82deb368e1688464e8ba84d24cf (diff) | |
download | rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.tar.gz rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.tar.xz rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tests/diag.sh')
-rwxr-xr-x | tests/diag.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index d1242fb1..617118ba 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 nologfuncflow nostdout" +#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason @@ -22,7 +22,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 work-presort rsyslog.pipe - rm -f rsyslog.input + rm -f rsyslog.input rsyslog.empty rm -f core.* vgcore.* mkdir test-spool ;; @@ -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 stat-file1 + rm -f rsyslog.input stat-file1 #rsyslog.empty echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use |