my $opt_list = 0;
my $ldap = undef;
my $opt_resetup_env = undef;
-my $opt_binary_mapping = "";
my $opt_load_list = undef;
my $opt_libnss_wrapper_so_path = "";
my $opt_libresolv_wrapper_so_path = "";
'testlist=s' => \@testlists,
'random-order' => \$opt_random_order,
'load-list=s' => \$opt_load_list,
- 'binary-mapping=s' => \$opt_binary_mapping,
'nss_wrapper_so_path=s' => \$opt_libnss_wrapper_so_path,
'resolv_wrapper_so_path=s' => \$opt_libresolv_wrapper_so_path,
'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path,
my $target;
my $testenv_default = "none";
-my %binary_mapping = ();
-if ($opt_binary_mapping) {
- my @binmapping_list = split(/,/, $opt_binary_mapping);
- foreach my $mapping (@binmapping_list) {
- my ($bin, $map) = split(/\:/, $mapping);
- $binary_mapping{$bin} = $map;
- }
-}
-
-$ENV{BINARY_MAPPING} = $opt_binary_mapping;
-
# After this many seconds, the server will self-terminate. All tests
# must terminate in this time, and testenv will only stay alive this
# long
if ($opt_target eq "samba") {
$testenv_default = "ad_dc_ntvfs";
require target::Samba;
- $target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
+ $target = new Samba($bindir, $ldap, $srcdir, $server_maxtime);
} elsif ($opt_target eq "samba3") {
$testenv_default = "nt4_member";
require target::Samba3;
- $target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
+ $target = new Samba3($bindir, $srcdir_abs, $server_maxtime);
}
}
parser.add_option("--include", action="callback", help="Add file to include files", callback=read_includes)
parser.add_option("--testenv", help="run a shell in the requested test environment", action="store_true", default=False)
parser.add_option("--resetup-environment", help="Re-setup environment", action="store_true", default=False)
-parser.add_option("--binary-mapping", help="Map binaries to use", type=str)
parser.add_option("--load-list", help="Load list of tests to load from a file", type=str)
parser.add_option("--prefix", help="prefix to run tests in", type=str, default="./st")
parser.add_option("--srcdir", type=str, default=".", help="source directory")
testenv_default = "none"
-if opts.binary_mapping:
- binary_mapping = dict([l.split(":") for l in opts.binary_mapping.split(",")])
- os.environ["BINARY_MAPPING"] = opts.binary_mapping
-else:
- binary_mapping = {}
- os.environ["BINARY_MAPPING"] = ""
-
# After this many seconds, the server will self-terminate. All tests
# must terminate in this time, and testenv will only stay alive this
# long
sys.exit(1)
testenv_default = "ad_dc_ntvfs"
from selftest.target.samba import Samba
- target = Samba(opts.bindir, binary_mapping, ldap, opts.srcdir, server_maxtime)
+ target = Samba(opts.bindir, ldap, opts.srcdir, server_maxtime)
elif opts.target == "samba3":
if opts.socket_wrapper and not has_socket_wrapper(opts.bindir):
sys.stderr.write("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....\n")
sys.exit(1)
testenv_default = "member"
from selftest.target.samba3 import Samba3
- target = Samba3(opts.bindir, binary_mapping, srcdir_abs, server_maxtime)
+ target = Samba3(opts.bindir, srcdir_abs, server_maxtime)
elif opts.target == "none":
testenv_default = "none"
target = NoneTarget()
def bindir():
return os.path.normpath(os.getenv("BINDIR", "./bin"))
-binary_mapping = {}
-
def binpath(name):
- if name in binary_mapping:
- name = binary_mapping[name]
return os.path.join(bindir(), name)
-binary_mapping_string = os.getenv("BINARY_MAPPING", None)
-if binary_mapping_string is not None:
- for binmapping_entry in binary_mapping_string.split(','):
- try:
- (from_path, to_path) = binmapping_entry.split(':', 1)
- except ValueError:
- continue
- binary_mapping[from_path] = to_path
-
# Split perl variable to allow $PERL to be set to e.g. "perl -W"
perl = os.getenv("PERL", "perl").split()
use Cwd qw(abs_path);
sub new($$$$$) {
- my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $server_maxtime) = @_;
+ my ($classname, $bindir, $ldap, $srcdir, $server_maxtime) = @_;
my $self = {
- samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $server_maxtime),
- samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $server_maxtime),
+ samba3 => new Samba3($bindir, $srcdir, $server_maxtime),
+ samba4 => new Samba4($bindir, $ldap, $srcdir, $server_maxtime),
};
bless $self;
return $self;
sub bindir_path($$) {
my ($object, $path) = @_;
- if (defined($object->{binary_mapping}->{$path})) {
- $path = $object->{binary_mapping}->{$path};
- }
-
my $valpath = "$object->{bindir}/$path";
return $valpath if (-f $valpath);
}
sub new($$) {
- my ($classname, $bindir, $binary_mapping, $srcdir, $server_maxtime) = @_;
+ my ($classname, $bindir, $srcdir, $server_maxtime) = @_;
my $self = { vars => {},
bindir => $bindir,
- binary_mapping => $binary_mapping,
srcdir => $srcdir,
server_maxtime => $server_maxtime
};
use target::Samba3;
sub new($$$$$) {
- my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $server_maxtime) = @_;
+ my ($classname, $bindir, $ldap, $srcdir, $server_maxtime) = @_;
my $self = {
vars => {},
ldap => $ldap,
bindir => $bindir,
- binary_mapping => $binary_mapping,
srcdir => $srcdir,
server_maxtime => $server_maxtime,
- target3 => new Samba3($bindir, $binary_mapping, $srcdir, $server_maxtime)
+ target3 => new Samba3($bindir, $srcdir, $server_maxtime)
};
bless $self;
return $self;
import sys
-def bindir_path(binary_mapping, bindir, path):
+def bindir_path(bindir, path):
"""Find the executable to use.
- :param binary_mapping: Dictionary mapping binary names
:param bindir: Directory with binaries
:param path: Name of the executable to run
:return: Full path to the executable to run
"""
- path = binary_mapping.get(path, path)
valpath = os.path.join(bindir, path)
if os.path.isfile(valpath):
return valpath
class BinDirPathTests(TestCase):
def test_mapping(self):
- self.assertEquals("exe4",
- bindir_path({"exe": "exe4"}, "/some/path", "exe"))
- self.assertEquals("/bin/ls",
- bindir_path({"exe": "ls"}, "/bin", "exe"))
+ self.assertEquals("exe",
+ bindir_path("/some/path", "exe"))
+ self.assertEquals("/bin/exe",
+ bindir_path("/bin", "/bin/exe"))
def test_no_mapping(self):
- self.assertEqual("exe", bindir_path({}, "/some/path", "exe"))
+ self.assertEqual("exe", bindir_path("/some/path", "exe"))
self.assertEqual("/bin/ls",
- bindir_path({}, "/bin", "ls"))
+ bindir_path("/bin", "ls"))
class MkRealmsStanzaTests(TestCase):
and not issubclass(type(val), types.MethodType):
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
-
- binary_mapping = ('nmblookup3:nmblookup,' +
- 'nmblookup4:nmblookup4,' +
- 'smbclient3:smbclient,' +
- 'smbclient4:smbclient4,' +
- 'smbtorture4:smbtorture,' +
- 'ntlm_auth3:ntlm_auth')
-
- env.OPTIONS = '--binary-mapping=%s' % binary_mapping
+ env.OPTIONS = ''
if not Options.options.SLOWTEST:
env.OPTIONS += ' --exclude=${srcdir}/selftest/slow'
if Options.options.QUICKTEST: