summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-06-12 14:21:03 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-06-12 14:21:03 +0200
commit8c10fb7f004bfaa0318e347893847203c1bee9ea (patch)
tree2320a705482b643887fc23129443c897dd3649c2 /source4/selftest
parentba4a047b360c14587430d9bca6c7bf3a88445d6a (diff)
downloadsamba-8c10fb7f004bfaa0318e347893847203c1bee9ea.tar.gz
samba-8c10fb7f004bfaa0318e347893847203c1bee9ea.tar.bz2
samba-8c10fb7f004bfaa0318e347893847203c1bee9ea.zip
selftest: Output subunit on the buildfarm.
Diffstat (limited to 'source4/selftest')
-rw-r--r--source4/selftest/config.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 328ae09330..e6b338b9e7 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -17,8 +17,13 @@ test-subunit:: everything
slowtest:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FORMAT_TEST_OUTPUT) --immediate
+ifeq ($(RUN_FROM_BUILD_FARM),yes)
+test:: everything
+ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FILTER_XFAIL)
+else
test:: everything
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FORMAT_TEST_OUTPUT) --immediate
+endif
kvmtest:: everything
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) \