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)

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);