diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-22 04:09:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-22 04:09:17 +0200 |
| commit | 7a683618e79acef94235ff4adee275c462559ab5 (patch) | |
| tree | ffaa61c1a907fd46d3b91b1804f1a21cb4ae1cc2 | |
| parent | 5018fef8cb9573077a8d41150e12d962478b9831 (diff) | |
| download | samba-7a683618e79acef94235ff4adee275c462559ab5.tar.gz samba-7a683618e79acef94235ff4adee275c462559ab5.tar.bz2 samba-7a683618e79acef94235ff4adee275c462559ab5.zip | |
Require separate option for quicktest include list rather than making
assumptions about it.
| -rwxr-xr-x | selftest/selftest.pl | 4 | ||||
| -rw-r--r-- | source4/selftest/config.mk | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 6f9a723465..2484bd0687 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 74c177d8e8..43c5855d3a 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) |