[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  6427484... s3:build: build smbtorture4 when the merged build is selected
       via  b4cfa3b... buildtools/wafsamba: fix build group ordering
      from  f45cbb0... s4: Do not display by default the message Failed to send DsReplicaSync is other host is just unreachable

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6427484f84e3437bdabb90a2672ec7c037cedf0d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu May 13 19:30:46 2010 +0200

    s3:build: build smbtorture4 when the merged build is selected
    
    metze

commit b4cfa3b9e419268e99e54f4ecb8a4f7ad007f218
Author: Thomas Nagy <tnagy1024 at gmail.com>
Date:   Thu May 13 19:23:37 2010 +0200

    buildtools/wafsamba: fix build group ordering
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_utils.py |    7 +++++--
 source3/Makefile.in                |    3 +--
 source3/configure.in               |    2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index f036068..79b0ca3 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -238,6 +238,7 @@ def ENFORCE_GROUP_ORDERING(bld):
        a target with --target'''
     if Options.options.compile_targets:
         @feature('*')
+        @before('exec_rule', 'apply_core', 'collect')
         def force_previous_groups(self):
             if getattr(self.bld, 'enforced_group_ordering', False) == True:
                 return
@@ -262,12 +263,14 @@ def ENFORCE_GROUP_ORDERING(bld):
             if stop is None:
                 return
 
-            for g in bld.task_manager.groups:
+            for i in xrange(len(bld.task_manager.groups)):
+                g = bld.task_manager.groups[i]
+                bld.task_manager.current_group = i
                 if id(g) == stop:
                     break
                 debug('group: Forcing group %s', group_name(g))
                 for t in g.tasks_gen:
-                    if getattr(t, 'forced_groups', False) != True:
+                    if not getattr(t, 'forced_groups', False):
                         debug('group: Posting %s', t.name or t.target)
                         t.forced_groups = True
                         t.post()
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 06e288c..d661b94 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1355,7 +1355,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind. at SHLIBEXT@
 
 gpext_modules:: $(GPEXT_MODULES)
 
-torture:: SHOWFLAGS basics $(TORTURE_PROGS) 
+torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@
 
 smbtorture : SHOWFLAGS bin/smbtorture at EXEEXT@
 
@@ -3225,7 +3225,6 @@ samba4-configure: ../source4/configure
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && ../buildtools/bin/waf build --targets=asn1_compile,compile_et
 	cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
 	cp ../source4/bin/smbtorture bin/smbtorture4
 
diff --git a/source3/configure.in b/source3/configure.in
index 765bac7..04a1c05 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6680,6 +6680,8 @@ if test x$enable_merged_build = xyes; then
 	AC_SUBST(smbtorture4_path)
 	AC_SUBST(smbtorture4_option)
 	USESHARED="$saved_USESHARED"
+	SMBTORTURE4="bin/smbtorture4"
+	AC_SUBST(SMBTORTURE4)
 fi
 
 AC_SUBST(ZLIB_LIBS)


-- 
Samba Shared Repository