Require separate option for quicktest include list rather than making

assumptions about it.

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 6f9a7234654d9a5c414ccf21f504381825645af1..2484bd0687641216beb7c4a31fe24cae21f74284 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -518,10 +518,6 @@ foreach (@opt_exclude) {
        push (@excludes, read_test_regexes($_));
 }
 
-if ($opt_quick) {
-       push (@includes, read_test_regexes("selftest/quick"));
-}
-
 foreach (@opt_include) {
        push (@includes, read_test_regexes($_));
 }

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 74c177d8e84dd36d3eb4c5ade14058f53284ddcc..43c5855d3aefb072b86edb8cad41fb93c9b29a48 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -8,7 +8,7 @@ SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${
     $(TEST_OPTIONS) 
 
 SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow
-SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick 
+SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick
 
 slowtest:: everything
        $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)