summaryrefslogtreecommitdiffstats
path: root/tests/testsuites
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-09 09:15:14 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-09 09:15:14 +0100
commitde7726cbf0957384cc9261ac47d6bf65906739b5 (patch)
tree1d3dd581d5c2382c01d3bf39130b368ae0cc64e2 /tests/testsuites
parenta27c67a590a4a6186ac79326fa3abe4b95ab10fc (diff)
parentd97ad63e218112d7cd3a390854b2918407804976 (diff)
downloadrsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.gz
rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.xz
rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog runtime/datetime.h
Diffstat (limited to 'tests/testsuites')
-rw-r--r--tests/testsuites/parse-3164-buggyday.conf8
-rw-r--r--tests/testsuites/samples.parse-3164-buggyday6
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/testsuites/parse-3164-buggyday.conf b/tests/testsuites/parse-3164-buggyday.conf
new file mode 100644
index 00000000..937f423a
--- /dev/null
+++ b/tests/testsuites/parse-3164-buggyday.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format that we can easily parse in expect
+$template expect,"%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp:::date-rfc3164-buggyday%,%hostname%,%programname%,%syslogtag%,%msg%\n"
+*.* :omstdout:;expect
diff --git a/tests/testsuites/samples.parse-3164-buggyday b/tests/testsuites/samples.parse-3164-buggyday
new file mode 100644
index 00000000..e21df980
--- /dev/null
+++ b/tests/testsuites/samples.parse-3164-buggyday
@@ -0,0 +1,6 @@
+# in 3164-buggyday mode, we need to have a leading zero in front of the day
+<38> Mar 7 19:06:53 example tag: testmessage (only date actually tested)
+38,auth,info,Mar 07 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# and now one with a complete date:
+<38> Mar 17 19:06:53 example tag: testmessage (only date actually tested)
+38,auth,info,Mar 17 19:06:53,example,tag,tag:, testmessage (only date actually tested)