diff options
| author |   bluhm <bluhm@openbsd.org> | 2015-06-25 19:29:57 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2015-06-25 19:29:57 +0000 |
| commit | d20a5ce9c6512b0428337939b12eb387c6ea1a9d (patch) | |
| tree | 55a4e53c009a50a140d6d0379d3f5bedade0c45c | |
| parent | Ensure the setup block is DMA reachable. (diff) | |
| download | wireguard-openbsd-d20a5ce9c6512b0428337939b12eb387c6ea1a9d.tar.xz wireguard-openbsd-d20a5ce9c6512b0428337939b12eb387c6ea1a9d.zip | |
Align the three variants of Remote.pm.
| -rw-r--r-- | regress/sys/kern/sosplice/Remote.pm | 5 | ||||
| -rw-r--r-- | regress/sys/net/pf_divert/Remote.pm | 5 | ||||
| -rw-r--r-- | regress/usr.sbin/relayd/Remote.pm | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/regress/sys/kern/sosplice/Remote.pm b/regress/sys/kern/sosplice/Remote.pm index 70b494ea4b9..293fef26be2 100644 --- a/regress/sys/kern/sosplice/Remote.pm +++ b/regress/sys/kern/sosplice/Remote.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Remote.pm,v 1.2 2014/08/18 22:58:19 bluhm Exp $ +# $OpenBSD: Remote.pm,v 1.3 2015/06/25 19:29:57 bluhm Exp $ # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org> # @@ -66,8 +66,7 @@ sub child { my @cmd = ("ssh", "-n", @opts, $self->{remotessh}, "perl", "-I", "$dir/..", "$dir/".basename($0), $self->{forward}, $self->{listenaddr}, $self->{connectaddr}, $self->{connectport}, - ($self->{testfile} ? "$dir/".basename($self->{testfile}) : - ())); + ($self->{testfile} ? "$dir/".basename($self->{testfile}) : ())); print STDERR "execute: @cmd\n"; exec @cmd; die ref($self), " exec '@cmd' failed: $!"; diff --git a/regress/sys/net/pf_divert/Remote.pm b/regress/sys/net/pf_divert/Remote.pm index 6d725ec4283..4998fbe7905 100644 --- a/regress/sys/net/pf_divert/Remote.pm +++ b/regress/sys/net/pf_divert/Remote.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Remote.pm,v 1.4 2014/08/18 22:58:19 bluhm Exp $ +# $OpenBSD: Remote.pm,v 1.5 2015/06/25 19:29:57 bluhm Exp $ # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org> # @@ -74,8 +74,7 @@ sub child { "-I", $dir, "$dir/".basename($0), $self->{af}, $self->{bindaddr}, $self->{connectaddr}, $self->{connectport}, ($self->{bindport} ? $self->{bindport} : ()), - ($self->{testfile} ? "$dir/".basename($self->{testfile}) : - ())); + ($self->{testfile} ? "$dir/".basename($self->{testfile}) : ())); print STDERR "execute: @cmd\n"; $< = $>; exec @cmd; diff --git a/regress/usr.sbin/relayd/Remote.pm b/regress/usr.sbin/relayd/Remote.pm index c625c55a793..051b82c5af9 100644 --- a/regress/usr.sbin/relayd/Remote.pm +++ b/regress/usr.sbin/relayd/Remote.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Remote.pm,v 1.5 2014/08/18 22:58:19 bluhm Exp $ +# $OpenBSD: Remote.pm,v 1.6 2015/06/25 19:29:57 bluhm Exp $ # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org> # @@ -83,17 +83,18 @@ sub up { sub child { my $self = shift; + my @opts = split(' ', $ENV{SSH_OPTIONS}) if $ENV{SSH_OPTIONS}; my @sudo = $ENV{SUDO} ? "SUDO=$ENV{SUDO}" : (); my @ktrace = $ENV{KTRACE} ? "KTRACE=$ENV{KTRACE}" : (); my @relayd = $ENV{RELAYD} ? "RELAYD=$ENV{RELAYD}" : (); - my $curdir = dirname($0) || "."; - $curdir = getcwd() if $curdir eq "."; + my $dir = dirname($0); + $dir = getcwd() if ! $dir || $dir eq "."; my @cmd = ("ssh", @opts, $self->{remotessh}, @sudo, @ktrace, @relayd, "perl", - "-I", $curdir, "$curdir/".basename($0), $self->{forward}, + "-I", $dir, "$dir/".basename($0), $self->{forward}, $self->{listenaddr}, $self->{connectaddr}, $self->{connectport}, - ($self->{testfile} ? "$curdir/".basename($self->{testfile}) : ())); + ($self->{testfile} ? "$dir/".basename($self->{testfile}) : ())); print STDERR "execute: @cmd\n"; exec @cmd; die ref($self), " exec '@cmd' failed: $!"; |