The branch, master has been updated via 8953c7d s3-selftest: add another flaky s3-torture test to knownfail, this time OPLOCK4. via af2538d s3-build: remove -I../lib/addns. via c809824 waf-selftest: allow to call "make test SUBUNIT_FORMATTER=cat". via 88ff230 s3-waf: fix typo. via 6076f4b s3-selftest: run a couple of dgram NBT tests against s3. from 257f049 s3: sid->domain_sid in winbindd_samr sam_rids_to_names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8953c7dc266b8ccd03a42e53f38e29610181dd00 Author: Günther Deschner <g...@samba.org> Date: Thu Mar 10 23:56:14 2011 +0100 s3-selftest: add another flaky s3-torture test to knownfail, this time OPLOCK4. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Fri Mar 11 00:42:27 CET 2011 on sn-devel-104 commit af2538d16fdb8154dbb2d4720104a0fadfebf04f Author: Günther Deschner <g...@samba.org> Date: Fri Mar 4 13:16:40 2011 +0100 s3-build: remove -I../lib/addns. Guenther commit c8098246be66a96c5a9dfceab957c3d879746246 Author: Günther Deschner <g...@samba.org> Date: Fri Mar 4 14:22:35 2011 +0100 waf-selftest: allow to call "make test SUBUNIT_FORMATTER=cat". Guenther commit 88ff230ae9543fc22068392f44d8b6033e365abf Author: Günther Deschner <g...@samba.org> Date: Thu Mar 10 15:33:43 2011 +0100 s3-waf: fix typo. Guenther commit 6076f4b472bdb392fdea163602d577ca2119fcab Author: Günther Deschner <g...@samba.org> Date: Thu Mar 10 23:17:54 2011 +0100 s3-selftest: run a couple of dgram NBT tests against s3. Guenther ----------------------------------------------------------------------- Summary of changes: source3/.clang_complete | 2 +- source3/configure.in | 1 - source3/selftest/knownfail | 2 ++ source3/selftest/tests.py | 4 +++- source3/selftest/wscript | 4 +++- source3/utils/net_ads.c | 2 +- source3/utils/net_dns.c | 3 +-- source3/wscript | 2 +- source4/selftest/wscript | 4 +++- 9 files changed, 15 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/.clang_complete b/source3/.clang_complete index a13b5cd..c3f2f30 100644 --- a/source3/.clang_complete +++ b/source3/.clang_complete @@ -1,2 +1,2 @@ --I. -I./.. -Iinclude -I./../lib/replace -I./../lib/tevent -I./../lib/addns -I./librpc -I./../lib/talloc -I../lib/tdb/include +-I. -I./.. -Iinclude -I./../lib/replace -I./../lib/tevent -I./librpc -I./../lib/talloc -I../lib/tdb/include -Iinclude/includes.h.gch diff --git a/source3/configure.in b/source3/configure.in index 8d32a1b..74df9d4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -37,7 +37,6 @@ LIBS="${LIBS} ${TEVENT_LIBS}" SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}" -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/addns" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.." diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index 574910c..df2ec9b 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -7,3 +7,5 @@ samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermitt samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure .*driver.add_driver_timestamps # we only can store dates, not timestamps samba3.raw.mux.* #This test is flaky on the async lock time +samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel +samba3.posix_s3.nbt.dgram.*netlogon2 diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index d9ea831..4094a57 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -176,7 +176,9 @@ rap = ["rap.basic", "rap.rpc", "rap.printing", "rap.sam"] unix = ["unix.info2", "unix.whoami"] -tests= base + raw + smb2 + rpc + unix + local + winbind + rap +nbt = ["nbt.dgram" ] + +tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt sub = subprocess.Popen("%s --version 2> /dev/null" % smb4torture, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True) sub.communicate("") diff --git a/source3/selftest/wscript b/source3/selftest/wscript index 9a9cf90..f1c6510 100644 --- a/source3/selftest/wscript +++ b/source3/selftest/wscript @@ -85,7 +85,9 @@ def cmd_testonly(opt): env.TESTS = Options.options.TESTS - env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' + env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER') + if not env.SUBUNIT_FORMATTER: + env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source3/selftest/knownfail' if Options.options.FAIL_IMMEDIATELY: diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 3ee47b3..e6ac1c9 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1121,7 +1121,7 @@ static WERROR check_ads_config( void ) *******************************************************************/ #if defined(WITH_DNS_UPDATES) -#include "dns.h" +#include "../lib/addns/dns.h" DNS_ERROR DoDNSUpdate(char *pszServerName, const char *pszDomainName, const char *pszHostName, const struct sockaddr_storage *sslist, diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c index 61cb89d..5fbdc0a 100644 --- a/source3/utils/net_dns.c +++ b/source3/utils/net_dns.c @@ -21,10 +21,9 @@ #include "includes.h" #include "utils/net.h" -#include "dns.h" +#include "../lib/addns/dns.h" #if defined(WITH_DNS_UPDATES) - /* * Silly prototype to get rid of a warning */ diff --git a/source3/wscript b/source3/wscript index ad9b202..86af6b3 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1209,7 +1209,7 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED); syscall(SYS_initgroups, 16, NULL, NULL, 0); ''', 'HAVE_DARWIN_INITGROUPS', - msg='Checking hether to use the Darwin-specific initgroups system call') + msg='Checking whether to use the Darwin-specific initgroups system call') conf.CHECK_CODE('''struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));''', 'HAVE_UTIMBUF', diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 783b2ff..e9c24b0 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -85,7 +85,9 @@ def cmd_testonly(opt): env.TESTS = Options.options.TESTS - env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' + env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER') + if not env.SUBUNIT_FORMATTER: + env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source4/selftest/knownfail' if Options.options.FAIL_IMMEDIATELY: -- Samba Shared Repository