[SCM] Samba Shared Repository - branch master updated - 7a683618e79acef94235ff4adee275c462559ab5

[Jelmer Vernooij]

The branch, master has been updated
       via  7a683618e79acef94235ff4adee275c462559ab5 (commit)
      from  5018fef8cb9573077a8d41150e12d962478b9831 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7a683618e79acef94235ff4adee275c462559ab5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 22 04:09:17 2008 +0200

    Require separate option for quicktest include list rather than making
    assumptions about it.

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftest.pl       |    4 ----
 source4/selftest/config.mk |    2 +-
 2 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 6f9a723..2484bd0 100755
--- 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 74c177d..43c5855 100644
--- 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)


-- 
Samba Shared Repository