Specify skip list to selftest.pl, make make target depend on test

binaries.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a0151d12f932017b8b9d95882a823fef35b10d28..ac330b39ff551929c9932e00a439548fdffd850d 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2807,8 +2807,11 @@ valgrindtest:: all torture timelimit
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
         PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
 
-selftest::
-       ../selftest/selftest.pl --prefix=st --target=samba3 --testlist="`pwd`/selftest/tests.sh|" 
+selftest:: all torture timelimit
+       @../selftest/selftest.pl --prefix=st --target=samba3 \
+               --testlist="$(srcdir)/selftest/tests.sh|" \
+               --expected-failures=$(srcdir)/selftest/knownfail \
+               --exclude=$(srcdir)/selftest/skip 
 
 # Check for Winbind struct 32/64bit padding
 test_wbpad:

diff --git a/source3/selftest/quick b/source3/selftest/quick
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/source3/selftest/slow b/source3/selftest/slow
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 3ded5686c28358ffae05b73247d7714f613e4519..01f87debd0bad86fa63497ce82e8b08073f8289a 100755 (executable)
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -49,4 +49,4 @@ BINDIR=`dirname $0`/../bin
 plantest "talloctort" none $VALGRIND $BINDIR/talloctort 
 plantest "replacetort" none $VALGRIND $BINDIR/replacetort
 plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture
-plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
+#plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION