The branch, master has been updated via 0bfdb3e s3-selftest: move all skipped test to skiplist. via a32f0ff s3-waf: TLDAP is only needed by pdb_ads (and smbtorture). via ca57448 s3: no need to globally include intl.h. via c575d30 s3-selftest: when skipping tests, use the selftest/skip file. from 7312dac s4:acl LDB module - interpret "userAccountControl" as "uint32_t"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0bfdb3e2495a1f40ead2ee6b8ad70614f43fc939 Author: Günther Deschner <g...@samba.org> Date: Tue Feb 15 11:15:19 2011 +0100 s3-selftest: move all skipped test to skiplist. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Tue Feb 15 12:52:22 CET 2011 on sn-devel-104 commit a32f0ff2f095350197ffe3776c125681571e9f83 Author: Günther Deschner <g...@samba.org> Date: Mon Feb 7 14:27:55 2011 +0100 s3-waf: TLDAP is only needed by pdb_ads (and smbtorture). Guenther commit ca574482b889d42d9e8fbc6bea62acaa4bc15137 Author: Günther Deschner <g...@samba.org> Date: Mon Feb 14 12:02:00 2011 +0100 s3: no need to globally include intl.h. Guenther commit c575d30a32092665d104a06a12139528730b1287 Author: Günther Deschner <g...@samba.org> Date: Mon Feb 14 11:29:00 2011 +0100 s3-selftest: when skipping tests, use the selftest/skip file. Guenther ----------------------------------------------------------------------- Summary of changes: source3/include/includes.h | 1 - source3/param/loadparm.c | 2 +- source3/passdb/wscript_build | 2 +- source3/script/tests/test_posix_s3.sh | 18 ------------ source3/script/tests/test_smbtorture_s3.sh | 8 ----- source3/selftest/skip | 41 ++++++++++++++++----------- source3/utils/net.h | 1 + source3/wscript_build | 2 +- 8 files changed, 28 insertions(+), 47 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 8c4fcfe..2c67a75 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -594,7 +594,6 @@ extern void *cmdline_lp_ctx; #include "../lib/util/memory.h" #include "../lib/util/attr.h" #include "../lib/util/tsort.h" -#include "intl.h" #include "../lib/util/dlinklist.h" #include "tdb.h" #include "util_tdb.h" diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 04f3561..8a3d867 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -59,7 +59,7 @@ #include "ads.h" #include "../librpc/gen_ndr/svcctl.h" - +#include "intl.h" #include "smb_signing.h" #include "dbwrap.h" #include "smbldap.h" diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index be381c8..5a0b096 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -28,7 +28,7 @@ bld.SAMBA_MODULE('pdb_ldap', bld.SAMBA_MODULE('pdb_ads', subsystem='pdb', source=PDB_ADS_SRC, - deps='LIBCLI_LDAP_NDR', + deps='LIBCLI_LDAP_NDR TLDAP', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads')) diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 36c21da..8cdb1e2 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -71,14 +71,6 @@ if test "x$POSIX_SUBTESTS" != "x" ; then tests="$POSIX_SUBTESTS" fi -skipped="base.charset base.tcondev" -skipped="$skipped raw.acls raw.composite raw.context" -skipped="$skipped raw.ioctl" -skipped="$skipped raw.qfileinfo raw.qfsinfo" -skipped="$skipped raw.sfileinfo.base" - -echo "WARNING: Skipping tests $skipped" - ADDARGS="$ADDARGS --option=torture:sharedelay=100000" #ADDARGS="$ADDARGS --option=torture:writetimeupdatedelay=500000" @@ -87,16 +79,6 @@ for t in $tests; do if [ ! -z "$start" -a "$start" != $t ]; then continue; fi - skip=0 - for s in $skipped; do - if [ x"$s" = x"$t" ]; then - skip=1; - break; - fi - done - if [ $skip = 1 ]; then - continue; - fi start="" name="$t" if [ "$t" = "base.delaywrite" ]; then diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index 466855d..77ffc0c 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -35,14 +35,6 @@ tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST SHORTNAME-TEST" tests="$tests LOCAL-BASE64 LOCAL-GENCACHE POSIX-APPEND" tests="$tests LOCAL-string_to_sid" -skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN" -skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST" -skipped3="MANGLE UTABLE PIPE_NUMBER" -echo "Skipping the following tests:" -echo "$skipped1" -echo "$skipped2" -echo "$skipped3" - if test "x$SMBTORTURE_S3_SUBTESTS" != "x" ; then tests="$SMBTORTURE_S3_SUBTESTS" fi diff --git a/source3/selftest/skip b/source3/selftest/skip index 6487383..61fa03a 100644 --- a/source3/selftest/skip +++ b/source3/selftest/skip @@ -1,17 +1,24 @@ -samba3.smbconftort # Errors, needs smb.conf file -samba3.randomipc -samba3.negnowait -samba3.nbench -samba3.errmapextract -samba3.trans2scan -samba3.nttransscan -samba3.deny1 -samba3.deny2 -samba3.openattr -samba3.casetable -samba3.eatest -samba3.mangle -samba3.utable -samba3.pipe_number -samba3.smbtorture_s3.plain.CHAIN1 -samba3.smbtorture_s3.crypt.CHAIN1 +samba3.smbtorture_s3.*.randomipc +samba3.smbtorture_s3.*.negnowait +samba3.smbtorture_s3.*.nbench +samba3.smbtorture_s3.*.errmapextract +samba3.smbtorture_s3.*.trans2scan +samba3.smbtorture_s3.*.nttransscan +samba3.smbtorture_s3.*.deny1 +samba3.smbtorture_s3.*.deny2 +samba3.smbtorture_s3.*.openattr +samba3.smbtorture_s3.*.casetable +samba3.smbtorture_s3.*.eatest +samba3.smbtorture_s3.*.mangle +samba3.smbtorture_s3.*.utable +samba3.smbtorture_s3.*.pipe_number +samba3.smbtorture_s3.*.CHAIN1 +samba3.*base.charset +samba3.*base.tcondev +samba3.*raw.acls +samba3.*raw.composite +samba3.*raw.context +samba3.*raw.ioctl +samba3.*raw.qfileinfo +samba3.*raw.qfsinfo +samba3.*raw.sfileinfo.base diff --git a/source3/utils/net.h b/source3/utils/net.h index cefbc4e..ac30010 100644 --- a/source3/utils/net.h +++ b/source3/utils/net.h @@ -24,6 +24,7 @@ #include "localedir.h" +#include "intl.h" #ifdef HAVE_LIBINTL_H #include <libintl.h> #endif diff --git a/source3/wscript_build b/source3/wscript_build index 8f6bcad..2be51a3 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -795,7 +795,7 @@ bld.SAMBA_SUBSYSTEM('TLDAP', bld.SAMBA_SUBSYSTEM('PASSDB', source=PASSDB_SRC, - deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''', + deps='''GROUPDB SECRETS SMBLDAP pdb''', vars=locals()) bld.SAMBA_SUBSYSTEM('PARAM_UTIL', -- Samba Shared Repository