4 files changed, 53 insertions, 26 deletions
diff --git a/source4/samba4-quick b/source4/samba4-quick
index aec9098854..3627a87bbe 100644
--- a/source4/samba4-quick
+++ b/source4/samba4-quick
@@ -1,3 +1,8 @@
+# This file contains regexes matching the tests that should be run 
+# when doing a "quicktest" - verifying whether the build is working 
+# rather than trying to see what exactly is broken.
+#
+# This should be as quick as possible but cover as much code as possible.
 base.unlink
 base.attr
 base.delete
diff --git a/source4/samba4-skip b/source4/samba4-skip
index de572ed41e..dca5fc3a5d 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -1,18 +1,29 @@
+# This file contains a list of regular expressions matching testsuites that 
+# should be skipped during "make test".
+#
+# Possible reasons for adding a testsuite here:
+# * Tests functionality not implemented on the server side
+# * Testsuite crashes during run
+# * Testsuite crashes server
+#
+# If a testsuite is partially succeeding, please list the failing bits 
+# in the samba4-knownfail file rather than disabling the testsuite completely.
+#
+# If a testsuite is very slow, please add it to samba4-slow instead.
+#
+# Please add a comment for each testsuite you disable explaining why 
+# it is being skipped.
 base.delaywrite
 raw.composite
 base.iometer
 base.casetable
 base.nttrans
-.*base.bench.holdcon.*				# Very slow
-raw.bench.lookup	# Very slow
 base.scan.maxfid
 raw.hold.oplock		# Not a test, but a way to block other clients for a test
 raw.ping.pong		# Needs second server to test
 rpc.samr_accessmask
 raw.scan.eamax
 samba4.ntvfs.cifs.raw.qfileinfo.ipc
-base.utable
-base.smb
 smb2.notify
 smb2.scan
 ntvfs.cifs.base.charset
@@ -31,7 +42,6 @@ ntvfs.cifs.raw.qfileinfo.ipc
 rpc.dssync
 rpc.samsync
 ldap.uptodatevector					# Segfaults
-rpc.scanner							# Very slow
 rpc.remact							# Not provided by Samba 4
 rpc.oxidresolve						# Not provided by Samba 4
 rpc.eventlog						# Not provided by Samba 4
diff --git a/source4/samba4-slow b/source4/samba4-slow
index 05e62f44ef..e4387c1958 100644
--- a/source4/samba4-slow
+++ b/source4/samba4-slow
@@ -1,4 +1,7 @@
-.*base.bench.holdcon.*				# Very slow
-raw.bench.lookup	# Very slow
-base.utable						# Slow
-base.smb						# Slow
+# This file contains regexes matching tests that are very slow and 
+# should be skipped during a normal test run.
+.*base.bench.holdcon.*
+raw.bench.lookup
+base.utable
+base.smb
+rpc.scanner
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 4e9d31b684..2ae49b244b 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -7,66 +7,75 @@ SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefi
     --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \
     $(TEST_OPTIONS) 
 
-test:: everything
+SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/samba4-slow
+SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick 
+
+slowtest:: everything
 	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)
 
+test:: everything
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --immediate \
+		$(TESTS)
+
 kvmtest:: everything
-	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --target=kvm --image=$(KVM_IMAGE)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --immediate \
+		--target=kvm --image=$(KVM_IMAGE)
 
 kvmquicktest:: everything
-	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --quick --target=kvm --image=$(KVM_IMAGE)
+	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate \
+		$(SELFTEST_QUICK_OPTS) --target=kvm --image=$(KVM_IMAGE)
 
 testone:: everything
-	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)
 
 test-swrap:: everything
-	$(SELFTEST) --socket-wrapper --immediate $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --immediate $(TESTS)
 
 test-swrap-pcap:: everything
-	$(SELFTEST) --socket-wrapper-pcap --immediate $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-pcap --immediate $(TESTS)
 
 test-swrap-keep-pcap:: everything
-	$(SELFTEST) --socket-wrapper-keep-pcap --immediate $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper-keep-pcap --immediate $(TESTS)
 
 test-noswrap:: everything
-	$(SELFTEST) --immediate $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate $(TESTS)
 
 quicktest:: all
-	$(SELFTEST) --quick --socket-wrapper --immediate $(TESTS)
+	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --immediate $(TESTS)
 
 quicktestone:: all
-	$(SELFTEST) --quick --socket-wrapper --one $(TESTS)
+	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --one $(TESTS)
 
 testenv:: everything
-	$(SELFTEST) --socket-wrapper --testenv
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
 valgrindtest:: valgrindtest-all
 
 valgrindtest-quick:: all
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
+	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-all:: everything
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) --immediate --socket-wrapper $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
 valgrindtest-env:: everything
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
 	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-	$(SELFTEST) --socket-wrapper --testenv
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
 gdbtest:: gdbtest-all
 
 gdbtest-quick:: all
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
+	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
 
 gdbtest-all:: everything
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) --immediate --socket-wrapper $(TESTS)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
 
 gdbtest-env:: everything
 	SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-	$(SELFTEST) --socket-wrapper --testenv
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS)--socket-wrapper --testenv