The branch, master has been updated via d237698 blackbox.ldb: Support using system ldbsearch. via 3483ada selftest: Allow using ldb* utilities from system. from dbb9500 s4-libnet: use the full DNS domain for CLDAP lookups if possible
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d237698850f00325346335b53cfe31657026b940 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Nov 27 03:13:08 2010 +0100 blackbox.ldb: Support using system ldbsearch. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Sat Nov 27 04:32:11 CET 2010 on sn-devel-104 commit 3483adaf0a66ddda30c828a478b859bd8270a2e5 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Nov 27 03:03:50 2010 +0100 selftest: Allow using ldb* utilities from system. ----------------------------------------------------------------------- Summary of changes: selftest/target/Samba4.pm | 6 +++++- source4/selftest/tests.py | 4 +++- testprogs/blackbox/test_ldb.sh | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 3e42d03..12414f0 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -9,6 +9,7 @@ use strict; use Cwd qw(abs_path); use FindBin qw($RealBin); use POSIX; +use SocketWrapper; sub new($$$$$) { my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_; @@ -27,7 +28,10 @@ sub new($$$$$) { sub bindir_path($$) { my ($self, $path) = @_; - return "$self->{bindir}/$path$self->{exeext}"; + my $valpath = "$self->{bindir}/$path$self->{exeext}"; + + return $valpath if (-f $valpath); + return $path; } sub openldap_start($$$) { diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index bd743d2..1d95ad2 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -202,7 +202,9 @@ for t in smb4torture_testsuites("LDAP-"): ldbdir = os.path.join(samba4srcdir, "lib/ldb") # Don't run LDB tests when using system ldb, as we won't have ldbtest installed if os.path.exists(os.path.join(samba4bindir, "ldbtest")): - plantestsuite("ldb.base", "none", "TEST_DATA_PREFIX=$PREFIX %s/tests/test-tdb.sh" % ldbdir, allow_empty_output=True) + plantestsuite("ldb.base", "none", + "TEST_DATA_PREFIX=$PREFIX %s/tests/test-tdb.sh" % ldbdir, + allow_empty_output=True) else: skiptestsuite("ldb.base", "Using system LDB, ldbtest not available") diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh index 9a4780f..78fd93c 100755 --- a/testprogs/blackbox/test_ldb.sh +++ b/testprogs/blackbox/test_ldb.sh @@ -32,8 +32,9 @@ check() { return $status } +export PATH="$BUILDDIR/bin:$PATH" -ldbsearch="$VALGRIND $BUILDDIR/bin/ldbsearch$EXEEXT" +ldbsearch="$VALGRIND ldbsearch$EXEEXT" check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1` -- Samba Shared Repository