From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Oct 2008 15:32:07 +0000 (+0200)
Subject: Specify skip list to selftest.pl, make make target depend on test
X-Git-Tag: samba-4.0.0alpha6~767
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe02004865144dd5061a6cc9889bef6195de995e;p=thirdparty%2Fsamba.git

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

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a0151d12f93..ac330b39ff5 100644
--- 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
index e69de29bb2d..00000000000
diff --git a/source3/selftest/slow b/source3/selftest/slow
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 3ded5686c28..01f87debd0b 100755
--- 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