summaryrefslogtreecommitdiff
path: root/selftest/selftest.pl
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-18 17:38:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-19 14:26:59 +1000
commit9000188fb4226b4c70ae6b50292a0fe2a55e653c (patch)
tree666fada1d1712c226d8f6c5ccf9ac894bc9b42d4 /selftest/selftest.pl
parentaed450df0b38d6648cbfd3229722db82a85ad746 (diff)
downloadsamba-9000188fb4226b4c70ae6b50292a0fe2a55e653c.tar.gz
samba-9000188fb4226b4c70ae6b50292a0fe2a55e653c.tar.bz2
samba-9000188fb4226b4c70ae6b50292a0fe2a55e653c.zip
selftest Add combined 'Samba' target module
To work around environment variable handling, the initialisation of NSS_WRAPPER_WINBIND_SO_PATH is pushed in to Samba3.pm (the s3 autoconf build still overrides this) Andrew Bartlett
Diffstat (limited to 'selftest/selftest.pl')
-rwxr-xr-xselftest/selftest.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c4afde75c0..fe786f841b 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -481,7 +481,11 @@ sub bindir_path($$) {
return $path;
}
-if ($opt_target eq "samba4") {
+if ($opt_target eq "samba") {
+ $testenv_default = "all";
+ require target::Samba;
+ $target = new Samba($bindir, \%binary_mapping, \&bindir_path, $ldap, $srcdir, $exeext);
+} elsif ($opt_target eq "samba4") {
$testenv_default = "all";
require target::Samba4;
$target = new Samba4($bindir, \%binary_mapping, \&bindir_path, $ldap, $srcdir, $exeext);