From 1046940bb6e670e8f2d2dfbc5563ee90f4965356 Mon Sep 17 00:00:00 2001 From: Alexander Bluhm Date: Tue, 3 May 2016 17:05:32 +0000 Subject: To test syslogd compatibility rsyslog is used as remote server. New rsyslog has other options and debug output, adapt test. --- regress/usr.sbin/syslogd/RSyslogd.pm | 4 ++-- regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl | 3 +++ regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl | 2 +- regress/usr.sbin/syslogd/args-rsyslog-client-udp.pl | 3 +++ regress/usr.sbin/syslogd/args-rsyslog-tcp.pl | 2 +- regress/usr.sbin/syslogd/args-rsyslog-tls.pl | 3 ++- regress/usr.sbin/syslogd/args-rsyslog-udp.pl | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) (limited to 'regress/usr.sbin') diff --git a/regress/usr.sbin/syslogd/RSyslogd.pm b/regress/usr.sbin/syslogd/RSyslogd.pm index ab9b178a3c4..72f2069c1d4 100644 --- a/regress/usr.sbin/syslogd/RSyslogd.pm +++ b/regress/usr.sbin/syslogd/RSyslogd.pm @@ -1,4 +1,4 @@ -# $OpenBSD: RSyslogd.pm,v 1.4 2015/11/02 00:48:17 bluhm Exp $ +# $OpenBSD: RSyslogd.pm,v 1.5 2016/05/03 17:05:31 bluhm Exp $ # Copyright (c) 2010-2014 Alexander Bluhm # @@ -116,7 +116,7 @@ sub new { sub child { my $self = shift; - my @cmd = ("rsyslogd", "-dn", "-c4", "-f", $self->{conffile}, + my @cmd = ("rsyslogd", "-dn", "-f", $self->{conffile}, "-i", $self->{pidfile}); print STDERR "execute: @cmd\n"; exec @cmd; diff --git a/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl b/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl index fc840d7dcd9..f2ca3f08563 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl @@ -19,6 +19,9 @@ our %args = ( listen => { domain => AF_INET, proto => "udp", addr => "127.0.0.1" }, connect => { domain => AF_INET, proto => "tcp", addr => "127.0.0.1", port => 514 }, + loggrep => { + qr/omfile.* /.get_testgrep() => 1, + }, }, syslogd => { options => ["-T", "127.0.0.1:514"], diff --git a/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl b/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl index e75763b97b4..3f970e40ac8 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl @@ -20,7 +20,7 @@ our %args = ( connect => { domain => AF_INET, proto => "tls", addr => "127.0.0.1", port => 6514 }, loggrep => { - get_testgrep() => 1, + qr/omfile.* /.get_testgrep() => 1, qr/GnuTLS handshake succeeded/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-rsyslog-client-udp.pl b/regress/usr.sbin/syslogd/args-rsyslog-client-udp.pl index 1668b95342c..685dc26657a 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-client-udp.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-client-udp.pl @@ -19,6 +19,9 @@ our %args = ( listen => { domain => AF_INET, proto => "udp", addr => "127.0.0.1" }, connect => { domain => AF_INET, proto => "udp", addr => "127.0.0.1", port => 514 }, + loggrep => { + qr/omfile.* /.get_testgrep() => 1, + }, }, syslogd => { options => ["-U", "127.0.0.1:514"], diff --git a/regress/usr.sbin/syslogd/args-rsyslog-tcp.pl b/regress/usr.sbin/syslogd/args-rsyslog-tcp.pl index 3371be94919..f7197a63e57 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-tcp.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-tcp.pl @@ -18,7 +18,7 @@ our %args = ( rsyslogd => { listen => { domain => AF_INET, proto => "tcp", addr => "127.0.0.1" }, loggrep => { - get_testlog().qr/'$/ => 1, + qr/omfile.* /.get_testlog() => 1, qr/Error/ => 0, }, }, diff --git a/regress/usr.sbin/syslogd/args-rsyslog-tls.pl b/regress/usr.sbin/syslogd/args-rsyslog-tls.pl index 9d8df9409ab..26c818cd7c2 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-tls.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-tls.pl @@ -18,8 +18,9 @@ our %args = ( rsyslogd => { listen => { domain => AF_INET, proto => "tls", addr => "127.0.0.1" }, loggrep => { - get_testlog().qr/'$/ => 1, + qr/omfile.* /.get_testlog() => 1, qr/Error/ => 0, + qr/GnuTLS handshake/ => 1, }, }, ); diff --git a/regress/usr.sbin/syslogd/args-rsyslog-udp.pl b/regress/usr.sbin/syslogd/args-rsyslog-udp.pl index 99bdebc5135..e242fe390dd 100644 --- a/regress/usr.sbin/syslogd/args-rsyslog-udp.pl +++ b/regress/usr.sbin/syslogd/args-rsyslog-udp.pl @@ -14,7 +14,7 @@ our %args = ( rsyslogd => { listen => { domain => AF_INET, proto => "udp", addr => "127.0.0.1" }, loggrep => { - get_testlog().qr/'$/ => 1, + qr/imudp.*: /.get_testlog() => 1, qr/Error/ => 0, }, }, -- cgit v1.2.3