summaryrefslogtreecommitdiffstats
path: root/tests/parsertest.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
commitc8ebe623376bc025bf166ec333ac874c215de816 (patch)
tree2e1c6f6a149bce3844ed21da08e5f0695de3fecc /tests/parsertest.sh
parent497bfeb287a75d1fb0f37502d3805307311a574d (diff)
parent76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff)
downloadrsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip
Merge branch 'v4-beta' into beta
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
Diffstat (limited to 'tests/parsertest.sh')
-rwxr-xr-xtests/parsertest.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/parsertest.sh b/tests/parsertest.sh
index 470d9375..fb392db3 100755
--- a/tests/parsertest.sh
+++ b/tests/parsertest.sh
@@ -4,10 +4,18 @@ source $srcdir/diag.sh nettester parse1 udp
source $srcdir/diag.sh nettester parse1 tcp
source $srcdir/diag.sh nettester parse2 udp
source $srcdir/diag.sh nettester parse2 tcp
+source $srcdir/diag.sh nettester parse3 udp
+source $srcdir/diag.sh nettester parse3 tcp
+source $srcdir/diag.sh nettester parse_invld_regex udp
+source $srcdir/diag.sh nettester parse_invld_regex tcp
echo \[parsertest.sh]: redoing tests in IPv4-only mode
source $srcdir/diag.sh nettester parse1 udp -4
source $srcdir/diag.sh nettester parse1 tcp -4
source $srcdir/diag.sh nettester parse2 udp -4
source $srcdir/diag.sh nettester parse2 tcp -4
-source $srcdir/diag.sh init
+source $srcdir/diag.sh nettester parse3 udp -4
+source $srcdir/diag.sh nettester parse3 tcp -4
+source $srcdir/diag.sh nettester parse_invld_regex udp -4
+source $srcdir/diag.sh nettester parse_invld_regex tcp -4
+source $srcdir/diag.sh exit