diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 16:35:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 16:35:13 +0200 |
| commit | ab40107149038898ef24479a6911d9cd7770a56c (patch) | |
| tree | 7a4bd016dd56583263c63e10808859c6ef848ffc /tests/parsertest.sh | |
| parent | 5221a1e42e16c8c39b48a4a1a18ee6322c38cd17 (diff) | |
| parent | 9de685929e4c202d470e07ec28fda41a5efc8eaf (diff) | |
| download | rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.tar.gz rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.tar.bz2 rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/nettester.c
Diffstat (limited to 'tests/parsertest.sh')
| -rwxr-xr-x | tests/parsertest.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/parsertest.sh b/tests/parsertest.sh index 8e04b95e..ef33256e 100755 --- a/tests/parsertest.sh +++ b/tests/parsertest.sh @@ -1,13 +1,5 @@ -echo test parsertest via udp -$srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason - -echo test parsertest via tcp -./nettester -tparse1 -itcp -if [ "$?" -ne "0" ]; then - exit 1 -fi - -./nettester -tparse1 -iudp -if [ "$?" -ne "0" ]; then - exit 1 -fi +echo TEST: parsertest.sh - various parser tests +source $srcdir/diag.sh init +source $srcdir/diag.sh nettester parse1 udp +source $srcdir/diag.sh nettester parse1 tcp +source $srcdir/diag.sh init |