diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
commit | 0fa5486a4ace7a9be82b37979cf4693aff237340 (patch) | |
tree | 6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /tests/omod-if-array.sh | |
parent | 737614054caadf8340b638b368d43f55b7bb3741 (diff) | |
parent | aba90e82484118f3568ec51c01de5ba845da589a (diff) | |
download | rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.bz2 rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'tests/omod-if-array.sh')
-rwxr-xr-x | tests/omod-if-array.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/omod-if-array.sh b/tests/omod-if-array.sh index fd845b4d..7b4b5611 100755 --- a/tests/omod-if-array.sh +++ b/tests/omod-if-array.sh @@ -1,11 +1,13 @@ echo test omod-if-array via udp -./nettester omod-if-array udp +./killrsyslog.sh # kill rsyslogd if it runs for some reason + +./nettester -tomod-if-array -iudp -p4711 if [ "$?" -ne "0" ]; then exit 1 fi echo test omod-if-array via tcp -./nettester omod-if-array tcp +./nettester -tomod-if-array -itcp if [ "$?" -ne "0" ]; then exit 1 fi |