diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
| commit | 7053a438efd07361b6e33de4bdf254b1d3b58553 (patch) | |
| tree | bd5c83d8141bcd28a0c0a21f447ecdab522ab487 /tests/diag.sh | |
| parent | 6eeff56d010e48e4e5a7eca41223832edca5c5d1 (diff) | |
| parent | 4ebd062564c068566d60b4f54c047e6c082edf8e (diff) | |
| download | rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.gz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.xz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tests/diag.sh')
| -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 f65d197b..54232a37 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 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 core.* vgcore.* mkdir test-spool @@ -28,7 +28,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 rsyslog.random.data + rm -f rsyslog.out.*.log rsyslog.random.data work-presort rm -rf test-spool ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use |