summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-15 11:57:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-15 11:57:53 +0200
commit73f83d963bc8084a3efc186a383493cbcbc7886e (patch)
tree71ba4f9804f3d81a25f8ec2e58ae2389fa1112c5 /tests
parentc5408da3d8f17691fb91282d031757ed041fec55 (diff)
parent11c3b7d9e4198396dbe0bfa0308d80901072c673 (diff)
downloadrsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.gz
rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.xz
rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.zip
Merge branch 'master' into newqueue
Conflicts: tools/syslogd.c
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/testsuites/malformed1.parse15
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c31e9eaa..cdf2c4be 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -90,6 +90,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/rfc5424-2.parse1 \
testsuites/rfc5424-3.parse1 \
testsuites/rfc5424-4.parse1 \
+ testsuites/malformed.parse1 \
testsuites/omod-if-array.conf \
testsuites/1.omod-if-array \
testsuites/1.field1 \
diff --git a/tests/testsuites/malformed1.parse1 b/tests/testsuites/malformed1.parse1
new file mode 100644
index 00000000..2d95170d
--- /dev/null
+++ b/tests/testsuites/malformed1.parse1
@@ -0,0 +1,5 @@
+<131>Oct 8 23:05:06 10.321.1.123 05",result_code=200,b
+131,local0,err,Oct 8 23:05:06,10.321.1.123,05",result_code=200,b,05",result_code=200,b
+# a somewhat mangeld-with real-life sample of a malformed message
+# the key here is not what is being parsed, but that we do not abort!
+# NOTE: if a parser enhancement breaks the format, this is probably OK