summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-06-19 21:04:06 +0200
committerMichael Adam <obnox@samba.org>2009-06-19 21:13:38 +0200
commit8925778a61bc26e898d948ee445eb4f9781924de (patch)
treebda88fccea4ad28da97a4c821301b0c43bda02ab /source3
parent23c7eccc27d2263c069522a1f67e549882490040 (diff)
downloadsamba-8925778a61bc26e898d948ee445eb4f9781924de.tar.gz
samba-8925778a61bc26e898d948ee445eb4f9781924de.tar.bz2
samba-8925778a61bc26e898d948ee445eb4f9781924de.zip
s3: fix make test with external libtalloc or libtdb.
This skips the talloctort and tdbtorture tests when the corresponding binaries are not present. There might be more clever ways of detecting wether samba has been linked with internal or external libraries, but as a first approximation, this seems valid. Michael
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/script/tests/test_local_s3.sh17
1 files changed, 13 insertions, 4 deletions
diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 1840779085..0c94871ba5 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -16,14 +16,23 @@ incdir=`dirname $0`
failed=0
-testit "talloctort" $VALGRIND $BINDIR/talloctort || \
- failed=`expr $failed + 1`
+
+if test -x bin/talloctort ; then
+ testit "talloctort" $VALGRIND $BINDIR/talloctort || \
+ failed=`expr $failed + 1`
+else
+ echo "Skipping talloctort"
+fi
testit "replacetort" $VALGRIND $BINDIR/replacetort || \
failed=`expr $failed + 1`
-testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
- failed=`expr $failed + 1`
+if test -x bin/tdbtorture ; then
+ testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
+ failed=`expr $failed + 1`
+else
+ echo "Skipping tdbtorture"
+fi
testit "smbconftort" $VALGRIND $BINDIR/smbconftort $CONFIGURATION || \
failed=`expr $failed + 1`