diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
| commit | 1d41b9540ccf8b6714135737855ab71ee75f4364 (patch) | |
| tree | 2ce7356d2d4fcb4426edfd7e0ddd473bbed4baf5 /tests/diag.sh | |
| parent | 579c61e579d9452682da51ec5e4b547684573807 (diff) | |
| parent | 831ce25230f6c8cd7c362fda3616e1233a61cf00 (diff) | |
| download | rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.gz rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.xz rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
tcpsrv.c
tests/Makefile.am
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 1caf529f..3360e328 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -22,6 +22,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -f rsyslog.out.*.log work-presort rm -rf test-spool + rm -f rsyslog.input rm -f core.* vgcore.* mkdir test-spool ;; @@ -30,6 +31,7 @@ case $1 in rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -f rsyslog.out.*.log rsyslog.random.data work-presort rm -rf test-spool + rm -f rsyslog.input ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) |