diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
| commit | d9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch) | |
| tree | 861b66fbde7b876413c00e449315e2fbd81b07a5 /tests/diag.sh | |
| parent | 149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff) | |
| parent | 9de526eccd85324f8cff4968ac6b17fa66648c2b (diff) | |
| download | rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip | |
Merge branch 'v4-stable' into tmp
Conflicts:
ChangeLog
Makefile.am
tests/Makefile.am
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 61766221..40719737 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -17,10 +17,10 @@ case $1 in 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 rsyslogd.started work-*.conf rsyslog.random.data rm -f rsyslogd2.started work-*.conf rm -f work rsyslog.out.log rsyslog.out.log.save # common work files - rm -f rsyslog.out.*.log + rm -f rsyslog.out.*.log work-presort rm -rf test-spool rm -f rsyslog.pipe 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 rsyslog.out.log.save # common work files - rm -f rsyslog.out.*.log + rm -f rsyslog.out.*.log rsyslog.random.data work-presort rm -rf test-spool rm -f rsyslog.pipe echo ------------------------------------------------------------------------------- |