diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 15:48:05 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 15:48:05 +0100 |
| commit | 0e0eaae4336cf2847a7deb76b974b73311f4acfd (patch) | |
| tree | 6c62edec1bb739e4ac4f0ebbd2a50c1be8301f45 /tests/diag.sh | |
| parent | ec883905c13920de0bc33e5bdd0a75c80535b55c (diff) | |
| parent | 93de3028b302adf3e3fb8e65bda5ca8bab59e9cd (diff) | |
| download | rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.gz rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.xz rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.zip | |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index 383cd818..c0f736b8 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -16,6 +16,7 @@ case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason cp $srcdir/testsuites/diag-common.conf diag-common.conf cp $srcdir/testsuites/diag-common2.conf diag-common2.conf + rm -f rsyslog.action.*.include rm -f rsyslogd.started work-*.conf rm -f rsyslogd2.started work-*.conf rm -f work rsyslog.out.log rsyslog.out.log.save # common work files @@ -25,7 +26,7 @@ case $1 in mkdir test-spool ;; 'exit') rm -f rsyslogd.started work-*.conf diag-common.conf - rm -f rsyslogd2.started diag-common2.conf + rm -f rsyslogd2.started diag-common2.conf rsyslog.action.*.include rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -f rsyslog.out.*.log rm -rf test-spool |