diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
| commit | 398966be6d5a94d2602a08305b0533bf4a502a95 (patch) | |
| tree | 6d2a7458311963fb4393ecc8549e1ece2062a7e5 /tests | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
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 617118ba..3e0263c1 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 stat-file1 #rsyslog.empty echo ------------------------------------------------------------------------------- |