diff options
Diffstat (limited to 'selftest/target')
| -rw-r--r-- | selftest/target/Samba.pm | 8 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 4 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index d993611eda..64bc405137 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,$ldap, $srcdir, $exeext, $server_maxtime) = @_; + my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $server_maxtime) = @_; my $self = { - samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $exeext, $server_maxtime), - samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime), + samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $server_maxtime), + samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $server_maxtime), }; bless $self; return $self; @@ -53,7 +53,7 @@ sub bindir_path($$) { $path = $object->{binary_mapping}->{$path}; } - my $valpath = "$object->{bindir}/$path$object->{exeext}"; + my $valpath = "$object->{bindir}/$path"; return $valpath if (-f $valpath); return $path; diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 10f673ffcf..b710d5466d 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -12,13 +12,11 @@ use POSIX; use target::Samba; sub new($$) { - my ($classname, $bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime) = @_; - $exeext = "" unless defined($exeext); + my ($classname, $bindir, $binary_mapping, $srcdir, $server_maxtime) = @_; my $self = { vars => {}, bindir => $bindir, binary_mapping => $binary_mapping, srcdir => $srcdir, - exeext => $exeext, server_maxtime => $server_maxtime }; bless $self; diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index fa7988f67a..52c6d680d7 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -14,8 +14,7 @@ use target::Samba; use target::Samba3; sub new($$$$$) { - my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime) = @_; - $exeext = "" unless defined($exeext); + my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $server_maxtime) = @_; my $self = { vars => {}, @@ -23,9 +22,8 @@ sub new($$$$$) { bindir => $bindir, binary_mapping => $binary_mapping, srcdir => $srcdir, - exeext => $exeext, server_maxtime => $server_maxtime, - target3 => new Samba3($bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime) + target3 => new Samba3($bindir, $binary_mapping, $srcdir, $server_maxtime) }; bless $self; return $self; |