summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-09-30 09:07:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:32 -0500
commitf2e99e352f70556fce74b70bccdbd9f7f2084155 (patch)
tree79e01b66fe68192c9d7c5277599ba0f23b321d3d /source4/selftest
parent0988b807f65d0d4f4905b9a12598d29eee4f22c1 (diff)
downloadsamba-f2e99e352f70556fce74b70bccdbd9f7f2084155.tar.gz
samba-f2e99e352f70556fce74b70bccdbd9f7f2084155.tar.bz2
samba-f2e99e352f70556fce74b70bccdbd9f7f2084155.zip
r25437: let the default env for 'make testenv' depend on the target
as only samba4 supports the "member target yet. metze (This used to be commit 81bf9a063eb7193d4e5076d69bb4651b7ac229d1)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/selftest.pl7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 543fc314b0..231fd1e4c0 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -421,18 +421,21 @@ if ($opt_socket_wrapper) {
}
my $target;
+my $testenv_default = "none";
if ($opt_target eq "samba4") {
+ $testenv_default = "member";
$target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup");
} elsif ($opt_target eq "samba3") {
if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
}
-
+ $testenv_default = "dc";
$target = new Samba3($opt_bindir);
} elsif ($opt_target eq "win") {
die("Windows tests will not run with socket wrapper enabled.")
if ($opt_socket_wrapper);
+ $testenv_default = "dc";
$target = new Windows();
}
@@ -712,7 +715,7 @@ if ($opt_no_lazy_setup) {
if ($opt_testenv) {
my $testenv_name = $ENV{SELFTEST_TESTENV};
- $testenv_name = "member" unless defined($testenv_name);
+ $testenv_name = $testenv_default unless defined($testenv_name);
my $testenv_vars = setup_env($testenv_name);