diff options
6 files changed, 16 insertions, 16 deletions
diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl index a68360ed020..c8d92a5131e 100644 --- a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl +++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl @@ -50,8 +50,8 @@ our %args = ( get_thirdlog() => 0, qr/syslogd\[\d+\]: start/ => 1, qr/syslogd\[\d+\]: restart/ => 1, - get_charlog() => '~88', - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + get_charlog() => '~95', + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, @@ -63,7 +63,7 @@ our %args = ( qr/syslogd\[\d+\]: start/ => 1, qr/syslogd\[\d+\]: restart/ => 1, get_charlog() => 300, - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl index d6a0a9dcc7b..9ab95b23f2a 100644 --- a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl +++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl @@ -51,8 +51,8 @@ our %args = ( get_thirdlog() => 0, qr/syslogd\[\d+\]: start/ => 1, qr/syslogd\[\d+\]: restart/ => 1, - get_charlog() => '~88', - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + get_charlog() => '~91', + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, @@ -64,7 +64,7 @@ our %args = ( qr/syslogd\[\d+\]: start/ => 1, qr/syslogd\[\d+\]: restart/ => 1, get_charlog() => 300, - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl index e72fb1712d2..1daad25b64e 100644 --- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl +++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl @@ -49,7 +49,7 @@ our %args = ( get_thirdlog() => 0, get_testgrep() => 0, qr/syslogd\[\d+\]: start/ => 1, - get_charlog() => '~88', + get_charlog() => '~95', }, }, file => { @@ -60,7 +60,7 @@ our %args = ( get_testgrep() => 0, qr/syslogd\[\d+\]: start/ => 1, get_charlog() => 300, - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl index 9ee5f9cdb4d..47b10a35cec 100644 --- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl +++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl @@ -50,7 +50,7 @@ our %args = ( get_thirdlog() => 0, get_testgrep() => 0, qr/syslogd\[\d+\]: start/ => 1, - get_charlog() => '~88', + get_charlog() => '~91', }, }, file => { @@ -61,7 +61,7 @@ our %args = ( get_testgrep() => 0, qr/syslogd\[\d+\]: start/ => 1, get_charlog() => 300, - qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/ + qr/syslogd\[\d+\]: dropped 2[0-2][0-9] messages to remote loghost/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-dropped-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-tcp.pl index cd3367e1c01..5640ac056d6 100644 --- a/regress/usr.sbin/syslogd/args-dropped-tcp.pl +++ b/regress/usr.sbin/syslogd/args-dropped-tcp.pl @@ -31,7 +31,7 @@ our %args = ( loggrep => { get_between2loggrep(), get_charlog() => 400, - qr/ \(dropped\)/ => '~68', + qr/ \(dropped\)/ => '~61', }, }, server => { @@ -47,8 +47,8 @@ our %args = ( get_between2loggrep(), get_secondlog() => 1, get_thirdlog() => 0, - get_charlog() => '~333', - qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1, + get_charlog() => '~340', + qr/syslogd\[\d+\]: dropped [56][0-9] messages to loghost/ => 1, }, }, file => { diff --git a/regress/usr.sbin/syslogd/args-dropped-tls.pl b/regress/usr.sbin/syslogd/args-dropped-tls.pl index 52c1735ed0a..81a84ff2548 100644 --- a/regress/usr.sbin/syslogd/args-dropped-tls.pl +++ b/regress/usr.sbin/syslogd/args-dropped-tls.pl @@ -31,24 +31,24 @@ our %args = ( loggrep => { get_between2loggrep(), get_charlog() => 400, - qr/ \(dropped\)/ => '~68', + qr/ \(dropped\)/ => '~65', qr/SSL3_WRITE_PENDING/ => 0, }, }, server => { listen => { domain => AF_UNSPEC, proto => "tls", addr => "localhost" }, + rcvbuf => 2**12, func => sub { my $self = shift; ${$self->{syslogd}}->loggrep(get_thirdlog(), 20) or die ref($self), " syslogd did not receive third log"; read_log($self); }, - rcvbuf => 2**12, loggrep => { get_between2loggrep(), get_secondlog() => 1, get_thirdlog() => 0, - get_charlog() => '~333', + get_charlog() => '~336', qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1, }, }, |