selftest: Add some more documentation. Rename env => target to avoid confusion.

(This used to be commit 50b8a16d0cb5e1c4352e73900d1e98a812340cca)

1 files changed, 4 insertions, 5 deletions

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 96409558b1..46c3846b54 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -67,7 +67,7 @@ these tests will be counted as successes, successes will be counted as failures.
 
 The format for the file is, one entry per line:
 
-TESTSUITE-NAME/TEST-NAME
+TESTSUITE-NAME.TEST-NAME
 
 The reason for a test can also be specified, by adding a hash sign (#) and the reason 
 after the test name.
@@ -130,9 +130,6 @@ use POSIX;
 use Cwd qw(abs_path);
 use lib "$RealBin";
 use Subunit qw(parse_results);
-use env::Samba3;
-use env::Samba4;
-use env::Windows;
 use SocketWrapper;
 
 my $opt_help = 0;
@@ -429,17 +426,20 @@ my $testenv_default = "none";
 
 if ($opt_target eq "samba4") {
 	$testenv_default = "member";
+	use target::Samba4;
 	$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";
+	use target::Samba3;
 	$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";
+	use target::Windows;
 	$target = new Windows();
 }
 
@@ -741,7 +741,6 @@ sub teardown_env($)
 	delete $running_envs{$envname};
 }
 
-
 if ($opt_no_lazy_setup) {
 	setup_env($_) foreach (keys %required_envs);
 }