summaryrefslogtreecommitdiff
path: root/source4/main.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-03-21 15:57:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:37 -0500
commit2fca3f9082a70e1f153f6c9f195d95b0d48e363d (patch)
tree57146b03e224aede0bd6495beb3d5d717d424930 /source4/main.mk
parente2f26316cdeba1875be2cd583870ac6127c2be56 (diff)
downloadsamba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.tar.gz
samba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.tar.bz2
samba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.zip
r21909: Merge some of my recent improvements to the test infrastructure:
- Allow tests to specify what environment they need to run in (dc and none are thecurrent supported ones). - Move more Samba4-specific code out of the common code (This used to be commit dbe9de10287c902f4a5ea5d431dea4a79f9b170b)
Diffstat (limited to 'source4/main.mk')
-rw-r--r--source4/main.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk
index f17917dc30..0518882109 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -283,7 +283,7 @@ realdistclean: distclean removebackup
check:: test
-SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} --builddir=$(builddir) --srcdir=$(srcdir) --expected-failures=samba4-knownfail --skip=samba4-skip
+SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} --builddir=$(builddir) --srcdir=$(srcdir) --expected-failures=samba4-knownfail --skip=samba4-skip $(TEST_OPTIONS)
test: all libraries
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) --immediate