diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:16:41 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 11:16:41 +0100 |
| commit | 9a53ec419e9d9e25a81b26a01ce5b035631e321a (patch) | |
| tree | 5e32a26ee0ef04c9683221dae1146f10e43d0c33 /tests/diag.sh | |
| parent | dffb2bab8cb52599626b82587da09df39b16e7aa (diff) | |
| parent | 4195f9cb08cddaeae37dc88c5e879d84391b4359 (diff) | |
| download | rsyslog-9a53ec419e9d9e25a81b26a01ce5b035631e321a.tar.gz rsyslog-9a53ec419e9d9e25a81b26a01ce5b035631e321a.tar.xz rsyslog-9a53ec419e9d9e25a81b26a01ce5b035631e321a.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tests/Makefile.am
tests/diag.sh
tests/tcpflood.c
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 2f307750..bf12fbda 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 |