diff options
Diffstat (limited to 'selftest/target/Samba.pm')
-rw-r--r-- | selftest/target/Samba.pm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index fc7e68dfde..ec8ab2bec9 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -10,11 +10,11 @@ use target::Samba3; use target::Samba4; sub new($$$$$) { - my ($classname, $bindir, $binary_mapping, $bindir_path, $ldap, $srcdir, $exeext, $server_maxtime) = @_; + my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $exeext, $server_maxtime) = @_; my $self = { - samba3 => new Samba3($bindir,$binary_mapping, $bindir_path, $srcdir, $exeext, $server_maxtime), - samba4 => new Samba4($bindir,$binary_mapping, $bindir_path, $ldap, $srcdir, $exeext, $server_maxtime), + samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $exeext, $server_maxtime), + samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime), }; bless $self; return $self; @@ -42,4 +42,17 @@ sub setup_env($$$) return $env; } +sub bindir_path($$) { + my ($object, $path) = @_; + + if (defined($object->{binary_mapping}->{$path})) { + $path = $object->{binary_mapping}->{$path}; + } + + my $valpath = "$object->{bindir}/$path$object->{exeext}"; + + return $valpath if (-f $valpath); + return $path; +} + 1; |