summaryrefslogtreecommitdiffstats
path: root/regress/usr.sbin/syslogd/args-block-duplicate.pl
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2015-07-16 16:34:49 +0000
committerbluhm <bluhm@openbsd.org>2015-07-16 16:34:49 +0000
commitbb7ea376b3b95bf0e689c799c1e5c542e041bf34 (patch)
treee5250c9f973295581cb422e5bf306d117674f3e1 /regress/usr.sbin/syslogd/args-block-duplicate.pl
parentKill a possibly running syslogd with -9 before testing. (diff)
downloadwireguard-openbsd-bb7ea376b3b95bf0e689c799c1e5c542e041bf34.tar.xz
wireguard-openbsd-bb7ea376b3b95bf0e689c799c1e5c542e041bf34.zip
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-block-duplicate.pl')
-rw-r--r--regress/usr.sbin/syslogd/args-block-duplicate.pl18
1 files changed, 9 insertions, 9 deletions
diff --git a/regress/usr.sbin/syslogd/args-block-duplicate.pl b/regress/usr.sbin/syslogd/args-block-duplicate.pl
index b8f8a364ee3..66778dce7f5 100644
--- a/regress/usr.sbin/syslogd/args-block-duplicate.pl
+++ b/regress/usr.sbin/syslogd/args-block-duplicate.pl
@@ -12,7 +12,7 @@ use Cwd;
use Sys::Hostname;
my $objdir = getcwd();
-(my $hostname = hostname()) =~ s/\..*//;
+(my $host = hostname()) =~ s/\..*//;
our %args = (
syslogd => {
@@ -28,7 +28,7 @@ our %args = (
*.* $objdir/file-2.log
*.* $objdir/file-4.log
*.* $objdir/file-5.log
-+$hostname
++$host
*.* $objdir/file-2.log
*.* $objdir/file-3.log
*.* $objdir/file-5.log
@@ -37,13 +37,13 @@ EOF
},
# exactly the files in the last block get the log message
multifile => [
- { loggrep => { get_testlog() => 0 } },
- { loggrep => { get_testlog() => 0 } },
- { loggrep => { get_testlog() => 1 } },
- { loggrep => { get_testlog() => 1 } },
- { loggrep => { get_testlog() => 0 } },
- { loggrep => { get_testlog() => 1 } },
- { loggrep => { get_testlog() => 1 } },
+ { loggrep => { get_testgrep() => 0 } },
+ { loggrep => { get_testgrep() => 0 } },
+ { loggrep => { get_testgrep() => 1 } },
+ { loggrep => { get_testgrep() => 1 } },
+ { loggrep => { get_testgrep() => 0 } },
+ { loggrep => { get_testgrep() => 1 } },
+ { loggrep => { get_testgrep() => 1 } },
],
);