summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-21 17:32:07 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-21 17:32:07 +0200
commitfe02004865144dd5061a6cc9889bef6195de995e (patch)
tree4e7926d151370d4e68825284b316db8a6a624e11 /source3
parentecd293325c05ab5c179403b023747baf3ee5ed37 (diff)
downloadsamba-fe02004865144dd5061a6cc9889bef6195de995e.tar.gz
samba-fe02004865144dd5061a6cc9889bef6195de995e.tar.bz2
samba-fe02004865144dd5061a6cc9889bef6195de995e.zip
Specify skip list to selftest.pl, make make target depend on test
binaries.
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in7
-rw-r--r--source3/selftest/quick0
-rw-r--r--source3/selftest/slow0
-rwxr-xr-xsource3/selftest/tests.sh2
4 files changed, 6 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a0151d12f9..ac330b39ff 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 e69de29bb2..0000000000
--- a/source3/selftest/quick
+++ /dev/null
diff --git a/source3/selftest/slow b/source3/selftest/slow
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source3/selftest/slow
+++ /dev/null
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 3ded5686c2..01f87debd0 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