diff options
| author |   bluhm <bluhm@openbsd.org> | 2014-07-10 22:33:44 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2014-07-10 22:33:44 +0000 |
| commit | 2a1fe41f40dc6d8144294d33464e693258e83d50 (patch) | |
| tree | e3e9126ae129f2834e848e2b8cf097865763a7de | |
| parent | instead of defining two versions of bucketidx, just don't inline for small. (diff) | |
| download | wireguard-openbsd-2a1fe41f40dc6d8144294d33464e693258e83d50.tar.xz wireguard-openbsd-2a1fe41f40dc6d8144294d33464e693258e83d50.zip | |
Test relayd error message for a broken config file.
| -rw-r--r-- | regress/usr.sbin/relayd/Relayd.pm | 4 | ||||
| -rw-r--r-- | regress/usr.sbin/relayd/args-dryrun.pl | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/regress/usr.sbin/relayd/Relayd.pm b/regress/usr.sbin/relayd/Relayd.pm index bdd88e08a53..3defcb0c384 100644 --- a/regress/usr.sbin/relayd/Relayd.pm +++ b/regress/usr.sbin/relayd/Relayd.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Relayd.pm,v 1.10 2014/06/22 14:18:01 bluhm Exp $ +# $OpenBSD: Relayd.pm,v 1.11 2014/07/10 22:33:44 bluhm Exp $ # Copyright (c) 2010-2012 Alexander Bluhm <bluhm@openbsd.org> # @@ -27,7 +27,7 @@ sub new { my %args = @_; $args{logfile} ||= "relayd.log"; $args{up} ||= "Started"; - $args{down} ||= $args{dryrun} ? "no actions" : "parent terminating"; + $args{down} ||= $args{dryrun} ? "relayd.conf:" : "parent terminating"; $args{func} = sub { Carp::confess "$class func may not be called" }; $args{conffile} ||= "relayd.conf"; $args{forward} diff --git a/regress/usr.sbin/relayd/args-dryrun.pl b/regress/usr.sbin/relayd/args-dryrun.pl new file mode 100644 index 00000000000..23b7c3faf73 --- /dev/null +++ b/regress/usr.sbin/relayd/args-dryrun.pl @@ -0,0 +1,20 @@ +# test broken config + +use strict; +use warnings; + +our %args = ( + client => { + noclient => 1, + }, + relayd => { + protocol => [ "foo" ], + dryrun => qr/invalid protocol type: foo/, + }, + server => { + noserver => 1, + }, + nocheck => 1, +); + +1; |