[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed Sep 29 02:26:52 MDT 2010
The branch, master has been updated
via 9dcd5e6 s3-waf: add basic make test infrastructure, not able to test yet.
via bea8035 s3-waf: clean up socket-wrapper and nss-wrapper a little.
via 292801b s3-waf: add vlp binary.
from 3131082 s4-spnupdate: when we are a RODC we need to use the WriteSPN DRS call
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9dcd5e6c8f524f88a028c296023b408e07eb37e4
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 29 08:54:00 2010 +0200
s3-waf: add basic make test infrastructure, not able to test yet.
Guenther
commit bea8035c22be075a4f89aa17cf225b7b2f499d74
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 29 08:49:39 2010 +0200
s3-waf: clean up socket-wrapper and nss-wrapper a little.
Guenther
commit 292801bdf39ebdd644d15428d8326147940687b1
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 29 08:48:49 2010 +0200
s3-waf: add vlp binary.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/selftest/slow | 1 +
{source4 => source3}/selftest/wscript | 6 +++---
source3/wscript | 2 ++
source3/wscript_build | 25 ++++++++++---------------
4 files changed, 16 insertions(+), 18 deletions(-)
create mode 100644 source3/selftest/slow
copy {source4 => source3}/selftest/wscript (93%)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/slow b/source3/selftest/slow
new file mode 100644
index 0000000..bb3b066
--- /dev/null
+++ b/source3/selftest/slow
@@ -0,0 +1 @@
+#none
diff --git a/source4/selftest/wscript b/source3/selftest/wscript
similarity index 93%
copy from source4/selftest/wscript
copy to source3/selftest/wscript
index 58cddb4..b3139d5 100644
--- a/source4/selftest/wscript
+++ b/source3/selftest/wscript
@@ -70,7 +70,7 @@ def cmd_testonly(opt):
opt.env = env
if (not CONFIG_SET(opt, 'NSS_WRAPPER') or
- not CONFIG_SET(opt, 'UID_WRAPPER') or
+# not CONFIG_SET(opt, 'UID_WRAPPER') or
not CONFIG_SET(opt, 'SOCKET_WRAPPER')):
print("ERROR: You must use --enable-selftest to enable selftest")
sys.exit(1)
@@ -119,13 +119,13 @@ def cmd_testonly(opt):
ADD_LD_LIBRARY_PATH('bin/shared')
# tell build system where to find config.h
- os.environ['CONFIG_H'] = 'bin/default/source4/include/config.h'
+ os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
os.unlink(st_done)
- cmd = '(${PERL} ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${PERL} ../selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
cmd = EXPAND_VARIABLES(opt, cmd)
diff --git a/source3/wscript b/source3/wscript
index d124eb6..909008b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -20,6 +20,7 @@ def set_options(opt):
opt.BUNDLED_EXTENSION_DEFAULT('s3')
opt.RECURSE('../lib/replace')
opt.RECURSE('build')
+ opt.RECURSE('selftest')
opt.RECURSE('../lib/nss_wrapper')
opt.RECURSE('../lib/socket_wrapper')
opt.RECURSE('../lib/tevent')
@@ -405,6 +406,7 @@ return acl_get_perm_np(permset_d, perm);
conf.DEFINE('WITH_WINBIND', '1')
conf.find_program('awk', var='AWK')
+ conf.find_program('perl', var='PERL')
# Darwin has extra options to xattr-family functions
conf.CHECK_CODE('getxattr(0, 0, 0, 0, 0, 0);',
diff --git a/source3/wscript_build b/source3/wscript_build
index 634d843..ff091b5 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -151,13 +151,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
-NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''
- ${LIBREPLACE_SRC}
- ${SOCKET_WRAPPER_SRC}
- ${NSS_WRAPPER_SRC}'''
+LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
../lib/util/xfile.c ../lib/util/util_strlist.c
@@ -176,10 +170,6 @@ PTHREADPOOL_SRC = ''
LIBREPLACE_SRCS = ''
-SOCKET_WRAPPER_SRCS = ''
-
-NSS_WRAPPER_SRCS = ''
-
ZLIB_SRCS = ''
LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
@@ -237,7 +227,7 @@ KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c libaddns/dnssock.c
libaddns/dnsgss.c libaddns/dnsmarshall.c'''
-LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0}'''
LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
@@ -1206,7 +1196,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG
- REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT''',
+ REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER''',
vars=locals())
if not bld.env.developer:
@@ -1375,7 +1365,7 @@ bld.SAMBA_BINARY('smbclient',
source=CLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
- LIBMSRPC READLINE DISPLAY_SEC''',
+ LIBMSRPC READLINE DISPLAY_SEC SOCKET_WRAPPER''',
vars=locals())
bld.SAMBA_BINARY('net',
@@ -1448,7 +1438,7 @@ bld.SAMBA_BINARY('smbget',
bld.SAMBA_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
- deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''',
+ deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR SOCKET_WRAPPER''',
vars=locals())
bld.SAMBA_BINARY('smbtorture',
@@ -1597,6 +1587,11 @@ bld.SAMBA_BINARY('split_tokens',
LIBSAMBA''',
vars=locals())
+bld.SAMBA_BINARY('vlp',
+ source=VLP_SRC,
+ deps='''talloc tdb NSS_WRAPPER''',
+ vars=locals())
+
swat_files=recursive_dirlist('../swat', '../swat', '*')
bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
--
Samba Shared Repository
More information about the samba-cvs
mailing list