summaryrefslogtreecommitdiffstats
path: root/tests/testsuites/parse_invld_regex.conf
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-29 15:04:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-29 15:04:03 +0200
commit55639bd99d5c33b1ee9daa4ffa8597af9ec334bb (patch)
tree4e99e905cb1c123bb71cf04d0fdede90bc1f8ef0 /tests/testsuites/parse_invld_regex.conf
parent46ac70bb3073295f70bdddc8359d056bc0651909 (diff)
parente3b469befafe9fa55413eb8a7df35c120670c9bf (diff)
downloadrsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.tar.gz
rsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.tar.xz
rsyslog-55639bd99d5c33b1ee9daa4ffa8597af9ec334bb.zip
Merge branch 'v4-stable' into v4-stable-solaris
Diffstat (limited to 'tests/testsuites/parse_invld_regex.conf')
-rw-r--r--tests/testsuites/parse_invld_regex.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/testsuites/parse_invld_regex.conf b/tests/testsuites/parse_invld_regex.conf
index 736aae59..d18a2b3c 100644
--- a/tests/testsuites/parse_invld_regex.conf
+++ b/tests/testsuites/parse_invld_regex.conf
@@ -1,8 +1,10 @@
+# note: we need to strip off the TZ designator in the rfc3339 timestamp
+# as this test otherwise fails in different timezones!
$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 output,"%timereported:1:$:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n"
+$Template output,"%timereported:1:19:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n"
*.* :omstdout:;output