diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 14:14:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 14:14:59 +0200 |
| commit | 59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0 (patch) | |
| tree | dfa46b9835e484de9462e2721a462df51f2e521f /tests/diag.sh | |
| parent | 0944d4b5422b232daadfe4acc6a73c5e2e83c77b (diff) | |
| parent | 270e455d6d9c6e7e580d6784435bf57ddc71bd85 (diff) | |
| download | rsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.tar.gz rsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.tar.xz rsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.zip | |
Merge branch 'v5-stable'
Conflicts:
tests/diag.sh
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index 0bcb34ce..5b74a6dc 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -21,8 +21,7 @@ case $1 in rm -f rsyslogd2.started work-*.conf 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 rsyslog.out.*.log work-presort rsyslog.pipe rm -f core.* vgcore.* mkdir test-spool ;; @@ -30,7 +29,7 @@ case $1 in rm -f rsyslogd2.started diag-common2.conf rsyslog.action.*.include rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir - rm -f rsyslog.out.*.log rsyslog.random.data work-presort + rm -f rsyslog.out.*.log rsyslog.random.data work-presort rsyslog.pipe echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use |