svn commit: samba r25437 - in branches/SAMBA_4_0/source/selftest: .

[metze at samba.org]

Author: metze
Date: 2007-09-30 09:07:07 +0000 (Sun, 30 Sep 2007)
New Revision: 25437

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25437

Log:
let the default env for 'make testenv' depend on the target
as only samba4 supports the "member target yet.

metze
Modified:
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-30 08:32:10 UTC (rev 25436)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-30 09:07:07 UTC (rev 25437)
@@ -421,18 +421,21 @@
 }
 
 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_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);