diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 17:41:28 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 17:41:28 +0100 |
commit | 200e2b66308fb0ca861b5ba72d2b408b7f24aac3 (patch) | |
tree | 096885420457b9425fa8ccbbcdb1b005196a16a6 /tests/parsertest.sh | |
parent | 7a0c7c61a57730ead60b7d4982247b76febb3bd9 (diff) | |
parent | c8ebe623376bc025bf166ec333ac874c215de816 (diff) | |
download | rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.gz rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.xz rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.zip |
Merge branch 'beta' into master
Conflicts:
ChangeLog
tests/parsertest.sh
Diffstat (limited to 'tests/parsertest.sh')
-rwxr-xr-x | tests/parsertest.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/parsertest.sh b/tests/parsertest.sh index c7e3c67e..06fcc8d6 100755 --- a/tests/parsertest.sh +++ b/tests/parsertest.sh @@ -6,6 +6,10 @@ source $srcdir/diag.sh nettester parse2 udp source $srcdir/diag.sh nettester parse2 tcp source $srcdir/diag.sh nettester parse_8bit_escape udp source $srcdir/diag.sh nettester parse_8bit_escape 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 @@ -14,4 +18,8 @@ source $srcdir/diag.sh nettester parse2 udp -4 source $srcdir/diag.sh nettester parse2 tcp -4 source $srcdir/diag.sh nettester parse_8bit_escape udp -4 source $srcdir/diag.sh nettester parse_8bit_escape 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 |