diff options
author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-07-16 16:34:50 +0000 |
---|---|---|
committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-07-16 16:34:50 +0000 |
commit | 6575491efa05726f0bb0780fff58a71369b905e3 (patch) | |
tree | a2c1b828a8d8c9845f30319e687fa2e280b318cd /regress/usr.sbin/syslogd/args-client-unix.pl | |
parent | 4b27f6129efe0ba1e54373ec1d436938e51ec0ae (diff) |
Test that syslogd does not append white spaces to messages. Per
default the test pattern is stricter now. Also do some test cleanup
Diffstat (limited to 'regress/usr.sbin/syslogd/args-client-unix.pl')
-rw-r--r-- | regress/usr.sbin/syslogd/args-client-unix.pl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/regress/usr.sbin/syslogd/args-client-unix.pl b/regress/usr.sbin/syslogd/args-client-unix.pl index 142b59ccb5a..8327112965f 100644 --- a/regress/usr.sbin/syslogd/args-client-unix.pl +++ b/regress/usr.sbin/syslogd/args-client-unix.pl @@ -9,14 +9,24 @@ use strict; use warnings; use Sys::Hostname; -(my $host = hostname()) =~ s/\..*//; # short name +(my $host = hostname()) =~ s/\..*//; our %args = ( client => { logsock => { type => "unix" }, }, + syslogd => { + loggrep => get_testlog(), + }, + server => { + loggrep => get_testlog(), + }, + pipe => { + loggrep => get_testlog(), + }, file => { - loggrep => qr/ $host syslogd-regress\[\d+\]: /. get_testlog(), + # Sys::Syslog unix is broken, it appends a \n\0. + loggrep => qr/ $host syslogd-regress\[\d+\]: /.get_testlog().qr/ $/, }, ); |