diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 10:45:25 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 10:45:25 +0200 |
| commit | 2c8cf0b394e8625017a1290f73d0007d3b5b6d20 (patch) | |
| tree | 9d63288e05bbc7b8d8f75b8373884ce7613ba305 /source4/selftest/config.mk | |
| parent | c484b0465c8c2298c8d439677412f34e6bdd17f1 (diff) | |
| parent | 694a579cb8d418a4feb441a77c0dc000023f2c6e (diff) | |
| download | samba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.tar.gz samba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.tar.bz2 samba-2c8cf0b394e8625017a1290f73d0007d3b5b6d20.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
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 |