diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:46:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:46:32 +0100 |
| commit | ffa57b17b270be441c64161cd1a3c3123b58ee26 (patch) | |
| tree | eaec0a691437ffdb87795f4236a7e972b38ef746 /tests/diag.sh | |
| parent | fd26a42bdc04eaf497cafd9ef806a54f3de1a7e9 (diff) | |
| parent | 9a53ec419e9d9e25a81b26a01ce5b035631e321a (diff) | |
| download | rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.tar.gz rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.tar.xz rsyslog-ffa57b17b270be441c64161cd1a3c3123b58ee26.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index e8e3ce1c..82ff4054 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -22,6 +22,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir rm -f rsyslog.out.*.log work-presort rsyslog.pipe + rm -f rsyslog.input rm -f core.* vgcore.* mkdir test-spool ;; @@ -30,6 +31,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog2.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 rsyslog.pipe + rm -f rsyslog.input echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use |