diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-04-27 11:19:20 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-27 11:22:07 +1000 |
commit | 2a9a9454e8dc27e2da49bd513c1f8b3bad76bd25 (patch) | |
tree | 627f942d4f8cc0ee906c0e498f44724f5d1b3df7 /selftest/target/Samba.pm | |
parent | e04bab4a19658009e53949b814a58d177966a9cd (diff) | |
download | samba-2a9a9454e8dc27e2da49bd513c1f8b3bad76bd25.tar.gz samba-2a9a9454e8dc27e2da49bd513c1f8b3bad76bd25.tar.bz2 samba-2a9a9454e8dc27e2da49bd513c1f8b3bad76bd25.zip |
selftest: Make bindir_path much less complex
There is no need to pass it as a function pointer, just put it in 'Samba.pm'.
Andrew Bartlett
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; |