diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 10:20:37 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 10:20:37 +0200 |
commit | 694a579cb8d418a4feb441a77c0dc000023f2c6e (patch) | |
tree | d7292b8cfaa20982f8bdb223c9cb8a1628c985e7 /source4/selftest/config.mk | |
parent | 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74 (diff) | |
parent | 0fd0fc75c46b39a611c7f9a56081105714d73e36 (diff) | |
download | samba-694a579cb8d418a4feb441a77c0dc000023f2c6e.tar.gz samba-694a579cb8d418a4feb441a77c0dc000023f2c6e.tar.bz2 samba-694a579cb8d418a4feb441a77c0dc000023f2c6e.zip |
Merge branch 'selftest' of git://git.samba.org/jelmer/samba
Diffstat (limited to 'source4/selftest/config.mk')
-rw-r--r-- | source4/selftest/config.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 58db087105..74c177d8e8 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -2,12 +2,12 @@ TEST_FORMAT = plain SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \ --builddir=$(builddir) --srcdir=$(srcdir) \ - --expected-failures=$(srcdir)/samba4-knownfail \ + --expected-failures=$(srcdir)/selftest/knownfail \ --format=$(TEST_FORMAT) \ - --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \ + --exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \ $(TEST_OPTIONS) -SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/samba4-slow +SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick slowtest:: everything |