summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-21 16:01:44 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-22 16:20:10 +1100
commita82d9e4e72d624916b1e12393a73a4d79ae080d2 (patch)
tree91b8a2ad1beec40bc7c9fac497b80be0ded13b26 /selftest
parent0b066b88dfbcc612089cdb5d971b7bb1bb7542ed (diff)
downloadsamba-a82d9e4e72d624916b1e12393a73a4d79ae080d2.tar.gz
s3-selftest convert tests.sh to python
This should allow us a much better chance of invoking the subunit wrappers in the right way, at the right level. Andrew Bartlett
Diffstat (limited to 'selftest')
-rwxr-xr-xselftest/selftest.pl1
-rw-r--r--selftest/target/Samba3.pm6
2 files changed, 7 insertions, 0 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 4f1f1d422cc..4b42ec4801b 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -421,6 +421,7 @@ $ENV{SRCDIR} = $srcdir;
$ENV{SRCDIR_ABS} = $srcdir_abs;
$ENV{BUILDDIR} = $builddir;
$ENV{BUILDDIR_ABS} = $builddir_abs;
+$ENV{BINDIR} = $bindir_abs;
$ENV{EXEEXT} = $exeext;
my $tls_enabled = not $opt_quick;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 06f070d65d0..4d60a520027 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -134,6 +134,12 @@ sub setup_dc($$)
$self->wait_for_start($vars);
+ $vars->{DC_SERVER} = $vars->{SERVER};
+ $vars->{DC_SERVER_IP} = $vars->{SERVER_IP};
+ $vars->{DC_NETBIOSNAME} = $vars->{NETBIOSNAME};
+ $vars->{DC_USERNAME} = $vars->{USERNAME};
+ $vars->{DC_PASSWORD} = $vars->{PASSWORD};
+
$self->{vars}->{dc} = $vars;
return $vars;