summaryrefslogtreecommitdiffstats
path: root/tests/parsertest.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-29 11:07:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-29 11:07:15 +0200
commit8b9cef552de558ecfd130451c4dea22676184d38 (patch)
treed3b40f3bfc34f32bffbc08668dddd6c4e1a724d3 /tests/parsertest.sh
parentde7726cbf0957384cc9261ac47d6bf65906739b5 (diff)
parentb6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff)
downloadrsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.gz
rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.xz
rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog configure.ac doc/manual.html runtime/debug.c runtime/stream.c tests/Makefile.am tests/diskqueue.sh tests/nettester.c tools/omfile.c
Diffstat (limited to 'tests/parsertest.sh')
-rwxr-xr-xtests/parsertest.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/parsertest.sh b/tests/parsertest.sh
index ea2334c2..28f4b088 100755
--- a/tests/parsertest.sh
+++ b/tests/parsertest.sh
@@ -10,6 +10,12 @@ source $srcdir/diag.sh nettester parse_invld_regex udp
source $srcdir/diag.sh nettester parse_invld_regex tcp
source $srcdir/diag.sh nettester parse-3164-buggyday udp
source $srcdir/diag.sh nettester parse-3164-buggyday tcp
+source $srcdir/diag.sh nettester parse-nodate udp
+source $srcdir/diag.sh nettester parse-nodate tcp
+# the following samples can only be run over UDP as they are so
+# malformed they break traditional syslog/tcp framing...
+source $srcdir/diag.sh nettester snare_ccoff_udp udp
+source $srcdir/diag.sh nettester snare_ccoff_udp2 udp
echo \[parsertest.sh]: redoing tests in IPv4-only mode
source $srcdir/diag.sh nettester parse1 udp -4
@@ -22,4 +28,10 @@ source $srcdir/diag.sh nettester parse_invld_regex udp -4
source $srcdir/diag.sh nettester parse_invld_regex tcp -4
source $srcdir/diag.sh nettester parse-3164-buggyday udp -4
source $srcdir/diag.sh nettester parse-3164-buggyday tcp -4
+source $srcdir/diag.sh nettester parse-nodate udp -4
+source $srcdir/diag.sh nettester parse-nodate tcp -4
+# UDP-only tests
+source $srcdir/diag.sh nettester snare_ccoff_udp udp -4
+source $srcdir/diag.sh nettester snare_ccoff_udp2 udp -4
+
source $srcdir/diag.sh exit