summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-06-03 18:19:01 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-06-11 19:59:58 +0200
commit24f01e70aaefb390d081bcd8cec6cd42282430b4 (patch)
tree66280c4c8b9f059b8ae612efe2537db23cd8a783 /source4
parent4e276fb60a61f559e1d343261fc15c794c921dd7 (diff)
downloadsamba-24f01e70aaefb390d081bcd8cec6cd42282430b4.tar.gz
samba-24f01e70aaefb390d081bcd8cec6cd42282430b4.tar.bz2
samba-24f01e70aaefb390d081bcd8cec6cd42282430b4.zip
selftest: Use filter-xfail for known failures
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/config.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 033fd7938d..0b1f340f32 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -3,14 +3,17 @@ TEST_FORMAT = plain
SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \
$(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
--builddir=$(builddir) --srcdir=$(srcdir) \
- --expected-failures=$(srcdir)/selftest/knownfail \
--format=subunit \
--exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \
$(TEST_OPTIONS)
SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow
SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick
-FORMAT_TEST_OUTPUT = $(PERL) $(selftestdir)/format-subunit.pl --format=$(TEST_FORMAT)
+FILTER_XFAIL = $(PERL) $(selftestdir)/filter-xfail.pl --expected-failures=$(srcdir)/selftest/knownfail
+FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(PERL) $(selftestdir)/format-subunit.pl --format=$(TEST_FORMAT)
+
+subunittest:: everything
+ $(SELFTEST) $(TESTS)
slowtest:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS) | $(FORMAT_TEST_OUTPUT) --immediate