[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Mon Dec 27 08:44:03 MST 2010
The branch, master has been updated
via 706d479 .gitignore: cleanup old stuff
via 3321d87 s4:ldb: setup TEST_DATA_PREFIX for make test
via fd4436a s4:ldb:python/api: use filename() instead of hardcoded filenames
via aaa16b8 s4:ldb/tests: there's no need to copy samba4.png
via 7ea1b76 tdb: setup TEST_DATA_PREFIX for make test
via 01a1a71 s4:selftest: specify the gentest_seeds.dat location
via d0cbbee s4:selftest: selftest.pl already sets TEST_DATA_PREFIX
via 3b0425c selftest: setup $ENV{TEST_DATA_PREFIX}
from e1de884 s3:selftest: mark samba3.posix_s3.smb2.lock (dc).rw-exclusive as known to fail
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 706d479b21c0819063a555e6c8ae244df503f698
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 11:52:59 2010 +0100
.gitignore: cleanup old stuff
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Mon Dec 27 16:43:24 CET 2010 on sn-devel-104
commit 3321d87327cd0782a5835421ec3f469cb931fa10
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 12:29:07 2010 +0100
s4:ldb: setup TEST_DATA_PREFIX for make test
metze
commit fd4436abfe52577ed029c58054edd09c720d7e0d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 14:07:50 2010 +0100
s4:ldb:python/api: use filename() instead of hardcoded filenames
metze
commit aaa16b8224ecabda9a810246d445dcbcd02c8b86
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 13:17:00 2010 +0100
s4:ldb/tests: there's no need to copy samba4.png
metze
commit 7ea1b767977c8c201c0f5bfaeb01f96af4b51f7b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 12:20:47 2010 +0100
tdb: setup TEST_DATA_PREFIX for make test
metze
commit 01a1a71b55a21c7bc68d3713f5cc45e278f0d9e7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 14:16:19 2010 +0100
s4:selftest: specify the gentest_seeds.dat location
metze
commit d0cbbee2dd5f4857d24d7ef2c01087e35b09dc26
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 12:46:39 2010 +0100
s4:selftest: selftest.pl already sets TEST_DATA_PREFIX
metze
commit 3b0425c8c75f7e7f24bf567f3d5099ad48cbf9cc
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 27 12:57:18 2010 +0100
selftest: setup $ENV{TEST_DATA_PREFIX}
metze
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 239 +--------------------------------
lib/tdb/wscript | 6 +-
selftest/selftest.pl | 1 +
source4/lib/ldb/tests/photo.ldif | 2 +-
source4/lib/ldb/tests/python/api.py | 12 +-
source4/lib/ldb/tests/test-generic.sh | 3 -
source4/lib/ldb/wscript | 6 +-
source4/selftest/tests.py | 5 +-
source4/torture/tests/test_gentest.sh | 2 +-
9 files changed, 28 insertions(+), 248 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 3c521a2..51a1247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
bin/
+st/
.waf*
.lock-wscript
*~
*.1
*.3
*.8
-*_asn1_files
-*_asn1.h
+*.swp
+tags
+TAGS
+cscope.out
+*.x
autom4te.cache
config.cache
config.h
@@ -15,11 +19,6 @@ config.log
config.status
source3/configure
source3/Makefile
-lib/tdb/configure
-lib/tdb/Makefile
-*.d
-*_err.c
-*_err.h
examples/libsmbclient/Makefile.internal
examples/libsmbclient/smbwrapper/smbsh
examples/libsmbclient/smbwrapper/smbwrapper.so
@@ -51,8 +50,6 @@ examples/VFS/skel_opaque.so
examples/VFS/skel_transparent.so
*.gcda
*.gcno
-*.hd
-*.ho
*.o
*.patch
*.pc
@@ -61,12 +58,10 @@ examples/VFS/skel_transparent.so
semantic.cache
nsswitch/libnss_winbind.so
nsswitch/libnss_wins.so
-source3/bin/*
source3/config.cache
source3/config.log
source3/config.status
source3/configure
-source3/cscope.out
source3/exports/libnetapi.syms
source3/exports/libsmbclient.syms
source3/exports/libsmbsharemodes.syms
@@ -84,7 +79,6 @@ source3/lib/netapi/tests/Makefile
source3/library-versions
librpc/gen_ndr/*.*
source3/librpc/gen_ndr/*.*
-source4/librpc/gen_ndr/*.*
source3/nsswitch/*.so
source3/pkgconfig/*.pc
source3/proto_exists
@@ -94,233 +88,14 @@ source3/script/installbin.sh
source3/script/uninstallbin.sh
source3/smbadduser
source3/smbd/build_options.c
-source3/st
-source3/tags
-source3/TAGS
-source3/samba4-data.mk
-source3/samba4-config.mk
-source3/torture.tdb
-source4/apidocs
-source4/auth/ntlm/auth_proto.h
-source4/auth/auth_proto.h
-source4/auth/auth_sam.h
-source4/auth/auth_sam_reply.h
-source4/auth/credentials/credentials_krb5_proto.h
-source4/auth/credentials/credentials_proto.h
-source4/auth/gensec/gensec_proto.h
-source4/auth/gensec/schannel_proto.h
-source4/auth/gensec/schannel_state.h
-source4/auth/gensec/spnego_proto.h
-source4/auth/kerberos/proto.h
-source4/auth/ntlmssp/msrpc_parse.h
-source4/auth/ntlmssp/proto.h
-source4/auth/session_proto.h
-source4/auth/system_session_proto.h
-source4/bin/*
-source4/bin/modules/*
-source4/bin/shared/*.so*
-source4/build/smb_build/config.pm
-source4/cldap_server/proto.h
-source4/config.mk
-source4/coverage
-source4/data.mk
-source4/dsdb/common/proto.h
-source4/dsdb/kcc/kcc_service_proto.h
-source4/dsdb/repl/drepl_service_proto.h
-source4/dsdb/samdb/samdb_proto.h
-source4/dsdb/samdb/ldb_modules/util_proto.h
-source4/dsdb/samdb/ldb_modules/partition_proto.h
-source4/dsdb/schema/proto.h
-source4/extra_cflags.txt
-source4/foo.tdb
-source4/gentest_seeds.dat
-source4/heimdal/kdc/kdc-private.h
-source4/heimdal/kdc/kdc-protos.h
-source4/heimdal/lib/asn1/asn1_*
-source4/heimdal/lib/asn1/*_asn1-priv.h*
-source4/heimdal/lib/asn1/der-private.h
-source4/heimdal/lib/asn1/der-protos.h
-source4/heimdal/lib/asn1/krb5_asn1_files
-source4/heimdal/lib/asn1/krb5_asn1.h
-source4/heimdal/lib/des/hcrypto
-source4/heimdal/lib/gssapi/asn1_*.c
-source4/heimdal/lib/gssapi/gssapi_asn1-priv.h
-source4/heimdal/lib/gssapi/spnego_asn1-priv.h
-source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h
-source4/heimdal/lib/gssapi/spnego_asn1_files
-source4/heimdal/lib/gssapi/spnego_asn1.h
-source4/heimdal/lib/gssapi/spnego/spnego-private.h
-source4/heimdal/lib/hdb/asn1_*.c
-source4/heimdal/lib/hdb/hdb_asn1_files
-source4/heimdal/lib/hdb/hdb_asn1.h
-source4/heimdal/lib/hdb/hdb_asn1-priv.h
-source4/heimdal/lib/hdb/hdb_err.?
-source4/heimdal/lib/hdb/hdb-private.h
-source4/heimdal/lib/hdb/hdb-protos.h
-source4/heimdal/lib/hx509/asn1_*.c
-source4/heimdal/lib/hx509/*asn1-priv.h
-source4/heimdal/lib/hx509/hx509-private.h
-source4/heimdal/lib/hx509/hx509-protos.h
-source4/heimdal/lib/krb5/heim_err.?
-source4/heimdal/lib/krb5/k524_err.?
-source4/heimdal/lib/krb5/krb5_err.?
-source4/heimdal/lib/krb5/krb5-private.h
-source4/heimdal/lib/krb5/krb5-protos.h
-source4/heimdal/lib/ntlm/heimntlm-protos.h
-source4/heimdal/lib/roken/err.h
-source4/heimdal/lib/roken/vis.h
-source4/heimdal/lib/wind/*_table.?
-source4/heimdal/lib/asn1/*.hx
-source4/heimdal/lib/gssapi/*.hx
-source4/heimdal/lib/hdb/*.hx
-source4/heimdal/lib/hx509/*.hx
-source4/include/build.h
-source4/include/config_tmp.h
-source4/include/config_tmp.h.in
-source4/kdc/pac-glue_proto.h
-source4/ldap_server/proto.h
-source4/lib/charset/charset_proto.h
-source4/libcli/composite/proto.h
-source4/libcli/ldap/ldap_proto.h
-source4/libcli/libcli_proto.h
-libcli/nbt/nbtname.h
-libcli/smb/smb_common_proto.h
-source4/libcli/nbt/nbt_proto.h
-source4/libcli/raw/raw_proto.h
-source4/libcli/resolve/lp_proto.h
-source4/libcli/resolve/proto.h
-source4/libcli/security/proto.h
-source4/libcli/smb2/smb2_proto.h
-source4/libcli/smb_composite/proto.h
-source4/libcli/util/clilsa.h
-source4/libcli/util/proto.h
-source4/libcli/wrepl/winsrepl_proto.h
-source4/lib/cmdline/credentials.h
-source4/lib/cmdline/popt_credentials.h
-lib/crypto/test_proto.h
-source4/lib/db_wrap_proto.h
-source4/lib/ldb/bin
-source4/lib/ldb/examples/ldbreader
-source4/lib/ldb/examples/ldifreader
-source4/lib/ldb/lib
-source4/lib/ldb/man/*.html
-source4/lib/ldb/samba/ldif_handlers_proto.h
-source4/lib/ldb/tests/tmp
-source4/libnet/libnet_proto.h
-source4/lib/registry/regf.h
-source4/lib/registry/tdr_regf.c
-source4/lib/registry/tdr_regf.h
-source4/lib/registry/tests/proto.h
-source4/lib/registry/tools/common.h
-source4/librpc/idl-deps
-source4/librpc/ndr/libndr_proto.h
-source4/librpc/ndr/ndr_compression.h
-source4/librpc/ndr/ndr_table.h
-source4/librpc/rpc/dcerpc_proto.h
-source4/librpc/rpc/dcerpc_table.h
-source4/lib/samba3/samba3_proto.h
-source4/lib/samba3/samba3_smbpasswd_proto.h
-source4/lib/socket/netif_proto.h
-source4/lib/talloc/talloc.3.html
-source4/lib/talloc/testsuite
-source4/lib/tdb/bin/tdbbackup
-source4/lib/tdb/bin/tdbdump
-source4/lib/tdb/bin/tdbtool
-source4/lib/tdb/bin/tdbtorture
-lib/tdr/tdr_proto.h
-lib/util/apidocs
-lib/util/asn1_proto.h
-lib/util/pidfile.h
-lib/util/unix_privs.h
-lib/util/util_proto.h
-source4/mkconfig.mk
-source4/nbt_server/dgram/proto.h
-source4/nbt_server/nbt_server_proto.h
-source4/nbt_server/wins/winsdb_proto.h
-source4/nbt_server/wins/winsserver_proto.h
-source4/ntptr/ntptr_proto.h
-source4/ntvfs/cifs_posix_cli/proto.h
-source4/ntvfs/common/proto.h
-source4/ntvfs/ipc/proto.h
-source4/ntvfs/ntvfs_proto.h
-source4/ntvfs/posix/vfs_posix_proto.h
-source4/ntvfs/simple/proto.h
-source4/param/proto.h
-source4/param/secrets_proto.h
-source4/param/share_proto.h
-source4/passdb/proto.h
+source3/setup
pidl/blib
pidl/cover_db
pidl/Makefile
pidl/pm_to_blib
-source4/rpc_server/common/proto.h
-source4/rpc_server/dcerpc_server_proto.h
-source4/rpc_server/service_rpc.h
-source4/rpc_server/lsa/proto.h
-source4/rpc_server/samr/proto.h
-source4/rpc_server/srvsvc/proto.h
-source4/samba.info
-source4/scripting/ejs/ejsnet/proto.h
-source4/scripting/ejs/proto.h
-source4/smbd/pidfile.h
-source4/smbd/process_model_proto.h
-source4/smbd/service_proto.h
-source4/smb_server/service_smb_proto.h
-source4/smb_server/smb2/smb2_proto.h
-source4/smb_server/smb_server_proto.h
-source4/smb_server/smb/smb_proto.h
-source4/st
-source4/templates.ldb
-source4/test-results
-source4/tests
-source4/torture/auth/proto.h
-source4/torture/basic/proto.h
-source4/torture/ldap/proto.h
-source4/torture/ldb/proto.h
-source4/torture/libnet/proto.h
-source4/torture/libnetapi/proto.h
-source4/torture/libsmbclient/proto.h
-source4/torture/local/proto.h
-source4/torture/nbench/proto.h
-source4/torture/nbt/proto.h
-source4/torture/ndr/proto.h
-source4/torture/ntp/proto.h
-source4/torture/proto.h
-source4/torture/rap/proto.h
-source4/torture/raw/proto.h
-source4/torture/rpc/proto.h
-source4/torture/drs/proto.h
-source4/torture/smb2/proto.h
-source4/torture.tdb
-source4/torture/unix/proto.h
-source4/torture/winbind/proto.h
-source4/utils/net/net_proto.h
-source4/utils/net/drs/net_drs_proto.h
-source4/version.h
-source4/web_server/proto.h
-source4/winbind/idmap_proto.h
-source4/winbind/wb_helper.h
-source4/winbind/wb_proto.h
-source4/wrepl_server/wrepl_server_proto.h
-source4/heimdal/lib/roken/roken.h
-source4/lib/ldb-samba/ldif_handlers_proto.h
-source4/libcli/drsblobs_proto.h
-source4/ntvfs/posix/vfs_acl_proto.h
-source4/kdc/mit_samba.so
-*.swp
-tags
-*.x
packaging/RHEL-CTDB/samba.spec
packaging/RHEL/samba.spec
packaging/RHEL/makerpms.sh
-source3/setup
-lib/tevent/tevent.so
-lib/tevent/libtevent.so*
-lib/tevent/libtevent.a
-lib/tdb/libtdb.so
-lib/tdb/tdb.so
-lib/tdb/libtdb.a
-lib/tdb/bin
docs-xml/build/catalog.xml
docs-xml/*/images/*.eps
docs-xml/*/images/*.pdf
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 37b9b5b..8146a98 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -115,7 +115,11 @@ def build(bld):
def test(ctx):
'''run tdb testsuite'''
- import Utils, samba_utils
+ import Utils, samba_utils, shutil
+ test_prefix = "%s/st" % (Utils.g_module.blddir)
+ shutil.rmtree(test_prefix, ignore_errors=True)
+ os.makedirs(test_prefix)
+ os.putenv('TEST_DATA_PREFIX', test_prefix)
cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture')
ret = samba_utils.RUN_COMMAND(cmd)
print("testsuite returned %d" % ret)
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 9759220..5552736 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -666,6 +666,7 @@ if ($#testlists == -1) {
$ENV{SELFTEST_PREFIX} = "$prefix_abs";
$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
+$ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
if ($opt_socket_wrapper) {
$ENV{SELFTEST_INTERFACES} = $interfaces;
} else {
diff --git a/source4/lib/ldb/tests/photo.ldif b/source4/lib/ldb/tests/photo.ldif
index 28981b1..95ab065 100644
--- a/source4/lib/ldb/tests/photo.ldif
+++ b/source4/lib/ldb/tests/photo.ldif
@@ -1,5 +1,5 @@
dn: cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST
changetype: modify
add: jpegPhoto
-jpegPhoto:< file://tests/tmp/samba4.png
+jpegPhoto:< file://tests/samba4.png
diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 17c3172..cd9651e 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -449,11 +449,11 @@ class LdbMsgTests(unittest.TestCase):
def test_iter_items(self):
self.assertEquals(0, len(self.msg.items()))
- self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "dc=foo28")
+ self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "dc=foo28")
self.assertEquals(1, len(self.msg.items()))
def test_repr(self):
- self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "dc=foo29")
+ self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "dc=foo29")
self.msg["dc"] = "foo"
self.assertEquals("Message({'dn': Dn('dc=foo29'), 'dc': MessageElement(['foo'])})", repr(self.msg))
@@ -495,7 +495,7 @@ class LdbMsgTests(unittest.TestCase):
self.assertEquals(["bar"], list(self.msg["foo"]))
def test_keys(self):
- self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "@BASEINFO")
+ self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "@BASEINFO")
self.msg["foo"] = ["bla"]
self.msg["bar"] = ["bla"]
self.assertEquals(["dn", "foo", "bar"], self.msg.keys())
@@ -505,11 +505,11 @@ class LdbMsgTests(unittest.TestCase):
self.assertEquals("@BASEINFO", self.msg.dn.__str__())
def test_get_dn(self):
- self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "@BASEINFO")
+ self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "@BASEINFO")
self.assertEquals("@BASEINFO", self.msg.get("dn").__str__())
def test_get_invalid(self):
- self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "@BASEINFO")
+ self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "@BASEINFO")
self.assertRaises(TypeError, self.msg.get, 42)
def test_get_other(self):
@@ -535,7 +535,7 @@ class LdbMsgTests(unittest.TestCase):
self.assertEquals(msg1, msg2)
def test_equal_simplel(self):
- db = ldb.Ldb("foo.tdb")
+ db = ldb.Ldb(filename())
msg1 = ldb.Message()
msg1.dn = ldb.Dn(db, "foo=bar")
msg2 = ldb.Message()
diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh
index c8645a5..8bbb769 100755
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/source4/lib/ldb/tests/test-generic.sh
@@ -81,15 +81,12 @@ if [ $count != 3 ]; then
fi
echo "Testing binary file attribute value"
-mkdir -p tests/tmp
-cp $LDBDIR/tests/samba4.png tests/tmp/samba4.png
$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/photo.ldif || exit 1
count=`$VALGRIND ldbsearch$EXEEXT '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
if [ $count != 1 ]; then
echo returned $count records - expected 1
exit 1
fi
-rm -f tests/tmp/samba4.png
echo "*TODO* Testing UTF8 upper lower case searches !!"
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 97b7cc1..a7e93f6 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -241,7 +241,11 @@ def build(bld):
def test(ctx):
'''run ldb testsuite'''
- import Utils, samba_utils
+ import Utils, samba_utils, shutil
+ test_prefix = "%s/st" % (Utils.g_module.blddir)
+ shutil.rmtree(test_prefix, ignore_errors=True)
+ os.makedirs(test_prefix)
+ os.putenv('TEST_DATA_PREFIX', test_prefix)
cmd = 'tests/test-tdb.sh'
ret = samba_utils.RUN_COMMAND(cmd)
print("testsuite returned %d" % ret)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index d56d4ba..f108823 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -207,9 +207,8 @@ 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", "%s/tests/test-tdb.sh" % ldbdir,
+ allow_empty_output=True)
else:
skiptestsuite("ldb.base", "Using system LDB, ldbtest not available")
diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index 5aea91e..b85636b 100755
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -28,7 +28,7 @@ all_info.out.fname
internal_information.out.file_id
EOF
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --seed=1 --num-ops=100 --ignore=$PREFIX/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --seed=1 --seedsfile=$PREFIX/gentest_seeds.dat --num-ops=100 --ignore=$PREFIX/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
rm -f $PREFIX/gentest.ignore
--
Samba Shared Repository
More information about the samba-cvs
mailing list