diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
| commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
| tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /tests/diag.sh | |
| parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
| parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
| download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.xz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index 86551155..06512d4a 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -22,6 +22,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir rm -f rsyslog.out.*.log work-presort + rm -f rsyslog.out.*.log work-presort rm -f core.* vgcore.* mkdir test-spool ;; |