pass. Larger commits require discussion on samba-technical
list and review by the maintainer
-files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py*
+files: lib/tevent/py*, lib/talloc/py*, lib/ldb/py*, lib/tdb/py*
maintainers:
Jelmer Vernooij <jelmer@samba.org>
policy:
if [ $# -gt 0 ]; then
tests="$*"
else
- tests="lib/replace lib/talloc lib/tevent lib/tdb source4/lib/ldb"
+ tests="lib/replace lib/talloc lib/tevent lib/tdb lib/ldb"
fi
echo "testing in dirs $tests"
make install
make distcheck
case $d in
- "source4/lib/ldb")
+ "lib/ldb")
ldd bin/ldbadd
;;
"lib/replace")
# simple makefile wrapper to run waf
-WAF=WAF_MAKE=1 PATH=buildtools/bin:../../../buildtools/bin:$$PATH waf
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
all:
$(WAF) build
PREVPATH=`dirname $0`
-if [ -f $PREVPATH/../../../buildtools/bin/waf ]; then
- WAF=../../../buildtools/bin/waf
+if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
+ WAF=../../buildtools/bin/waf
elif [ -f $PREVPATH/buildtools/bin/waf ]; then
WAF=./buildtools/bin/waf
else
import wafsamba, samba_dist, Options
-samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
+samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tdb2:lib/tdb2 lib/tdb_compat:lib/tdb_compat lib/ccan:lib/ccan lib/tevent:lib/tevent lib/popt:lib/popt
buildtools:buildtools''')
"samba3" : "source3",
"samba3-waf": "source3",
"samba4" : ".",
- "ldb" : "source4/lib/ldb",
+ "ldb" : "lib/ldb",
"tdb" : "lib/tdb",
"talloc" : "lib/talloc",
"replace" : "lib/replace",
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
("test", "TDB_NO_FSYNC=1 make test", "text/plain"),
- ("check-clean-tree", "../../../script/clean-source-tree.sh", "text/plain"),
+ ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain") ],
("install", "make install", "text/plain"),
("test", "TDB_NO_FSYNC=1 make subunit-test", "text/x-subunit") ],
- "source4/lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ "lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain") ],
for t in smb4torture_testsuites("ldap."):
plansmbtorturetestsuite(t, "dc", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
-ldbdir = os.path.join(samba4srcdir, "lib/ldb")
+ldbdir = os.path.join(srcdir(), "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", "%s/tests/test-tdb.sh" % ldbdir,
plantestsuite(name, env, args)
-plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % samba4srcdir, 'api')
+plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % srcdir(), 'api')
planpythontestsuite("none", "samba.tests.credentials")
plantestsuite_idlist("samba.tests.gensec", "dc:local", [subunitrun, "$LISTOPT", '-U"$USERNAME%$PASSWORD"', "samba.tests.gensec"])
planpythontestsuite("none", "samba.tests.registry")
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
opt.RECURSE('lib/replace')
opt.RECURSE('dynconfig')
- opt.RECURSE('source4/lib/ldb')
+ opt.RECURSE('lib/ldb')
opt.RECURSE('selftest')
opt.RECURSE('source4/lib/tls')
opt.RECURSE('lib/nss_wrapper')
raise Utils.WafError('Python version 3.x is not supported by Samba yet')
conf.RECURSE('dynconfig')
- conf.RECURSE('source4/lib/ldb')
+ conf.RECURSE('lib/ldb')
conf.RECURSE('source4/heimdal_build')
conf.RECURSE('source4/lib/tls')
conf.RECURSE('source4/ntvfs/sysdep')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/ccan')
bld.RECURSE('lib/tdb_compat')
-bld.RECURSE('source4/lib/ldb')
+bld.RECURSE('lib/ldb')
bld.RECURSE('dynconfig')
bld.RECURSE('lib/util/charset')
bld.RECURSE('source4/scripting/python')
bld.RECURSE('nsswitch/libwbclient')
bld.RECURSE('source4/lib/samba3')
bld.RECURSE('source4/lib/socket')
-bld.RECURSE('source4/lib/ldb-samba')
+bld.RECURSE('lib/ldb-samba')
bld.RECURSE('source4/lib/tls')
bld.RECURSE('source4/lib/registry')
bld.RECURSE('source4/lib/messaging')