diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
commit | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (patch) | |
tree | 38e8065408eddf7acfdb5172d5a9b364bd436d72 /tests | |
parent | b035298e30a5caebbf9dbb7b57ad4e17497b2abf (diff) | |
parent | 4e11040e04c7147f9787e2a496591f7ada190480 (diff) | |
download | rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.gz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.xz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.zip |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
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 1f7de2cf..9fd878a4 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -20,7 +20,7 @@ case $1 in rm -f rsyslogd.started work-*.conf rsyslog.random.data rm -f rsyslogd2.started work-*.conf rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files - rm -rf test-spool test-logdir + rm -rf test-spool test-logdir stat-file1 rm -f rsyslog.out.*.log work-presort rsyslog.pipe rm -f rsyslog.input rsyslog.empty rm -f core.* vgcore.* @@ -29,7 +29,7 @@ case $1 in 'exit') rm -f rsyslogd.started work-*.conf diag-common.conf rm -f rsyslogd2.started diag-common2.conf rsyslog.action.*.include rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files - rm -rf test-spool test-logdir + rm -rf test-spool test-logdir stat-file1 rm -f rsyslog.out.*.log rsyslog.random.data work-presort rsyslog.pipe rm -f rsyslog.input rsyslog.conf.tlscert stat-file1 rsyslog.empty echo ------------------------------------------------------------------------------- |