summaryrefslogtreecommitdiff
path: root/regress/usr.sbin
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2015-10-31 19:46:34 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2015-10-31 19:46:34 +0000
commit212888e4206b0bb2ea2eac6cffbcaf6f6dd5474e (patch)
tree064986b5ab7d42b59d2df376e5ba19e8594e39d1 /regress/usr.sbin
parent37ef3ddca7758571712f71bba646d55d541b2b56 (diff)
As syslog(3) in libc no longer inserts the timestamp, the maximum
message length that may be generated by syslogd got longer. Adapt the test.
Diffstat (limited to 'regress/usr.sbin')
-rw-r--r--regress/usr.sbin/syslogd/args-bufsize-native.pl7
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/usr.sbin/syslogd/args-bufsize-native.pl b/regress/usr.sbin/syslogd/args-bufsize-native.pl
index b172d9a6aab..e9c53defc9b 100644
--- a/regress/usr.sbin/syslogd/args-bufsize-native.pl
+++ b/regress/usr.sbin/syslogd/args-bufsize-native.pl
@@ -12,8 +12,9 @@ use Sys::Hostname;
use constant MAXLINE => 8192;
(my $host = hostname()) =~ s/\..*//;
-# file entry is without <70> but with space and hostname
-my $filelen = MAXLINE - 4 + 1 + length($host);
+my $time = "... .. ..:..:.."; # Oct 30 19:10:11
+# file entry is without <70> but with space, timestamp and hostname
+my $filelen = MAXLINE - 4 + length($time) + 1 + length($host) + 1;
our %args = (
client => {
@@ -35,7 +36,7 @@ our %args = (
server => {
listen => { domain => AF_UNSPEC, proto => "tcp", addr => "localhost" },
# syslog over TCP appends a \n
- loggrep => { qr/^>>> 8193 .{8192}\n/ => 1 },
+ loggrep => { qr/^>>> 8209 <70>$time .{8188}\n/ => 1 },
},
file => {
loggrep => { qr/^.{$filelen}\n/ => 1 },