3 files changed, 25 insertions, 14 deletions
diff --git a/source4/selftest/README b/source4/selftest/README
index 1d67a6d85d..a0afda3d19 100644
--- a/source4/selftest/README
+++ b/source4/selftest/README
@@ -3,18 +3,22 @@ bunch of tests all at once.
 
 The following environments are currently available:
 
- - none: No server set up
+ - none: No server set up, no variables set.
  - dc: Domain controller set up. The following environment variables will 
    be set:
-     * USERNAME
-	 * PASSWORD
-	 * DOMAIN
-	 * REALM
-	 * SERVER
+     * USERNAME: Administrator user name
+	 * PASSWORD: Administrator password
+	 * DOMAIN: Domain name
+	 * REALM: Realm name
+	 * SERVER: DC host name 
+	 * SERVER_IP: DC IPv4 address
+	 * NETBIOSNAME: DC NetBIOS name
+	 * NETIOSALIAS: DC NetBIOS alias
+
  - member: Domain controller and member server that is joined to it set up. The
    following environment variables will be set:
-     * USERNAME
-	 * PASSWORD
-	 * DOMAIN
-	 * REALM
-	 * SERVER (contains the name of the member server)
+     * USERNAME: Domain administrator user name
+	 * PASSWORD: Domain administrator password
+	 * DOMAIN: Domain name
+	 * REALM: Realm name
+	 * SERVER: Name of the member server
diff --git a/source4/selftest/TODO b/source4/selftest/TODO
index 42f90188ed..67776ffc76 100644
--- a/source4/selftest/TODO
+++ b/source4/selftest/TODO
@@ -1,3 +1,2 @@
 - warn about unexpected successes
 - better way to detect that smbd has finished initialization
-- move ldap-specific code into mktestdc.sh
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index db5bd2cf27..03247a4f81 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -13,7 +13,7 @@ selftest - Samba test runner
 
 selftest --help
 
-selftest [--srcdir=DIR] [--builddir=DIR] [--target=samba4|samba3|win] [--socket-wrapper] [--quick] [--one] [--prefix=prefix] [--immediate] [TESTS]
+selftest [--srcdir=DIR] [--builddir=DIR] [--target=samba4|samba3|win] [--socket-wrapper] [--quick] [--one] [--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
 
 =head1 DESCRIPTION
 
@@ -69,15 +69,23 @@ The format for the file is, one entry per line:
 
 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.
+
 =item I<--skip>
 
 Specify a file containing a list of tests that should be skipped. Possible candidates are
-tests that segfault the server, flip or don't end.
+tests that segfault the server, flip or don't end. The format of this file is the same as 
+for the --expected-failures flag.
 
 =item I<--one>
 
 Abort as soon as one test fails.
 
+=item I<--testlist>
+
+Load a list of tests from the specified location.
+
 =back
 
 =head1 ENVIRONMENT