[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Mon Jul 11 13:54:04 UTC 2016


The branch, master has been updated
       via  2f95ada ctdb: fix autotest with socket-wrapper installed in the system
       via  c1c2a1c swrap: Build socket_wrapper path relative to blddir
       via  b32df94 autobuild: Don't compare socket wrapper so_path for xc check
      from  4c4c3e0 tests/dns_update: Add error message for diagnosis

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


- Log -----------------------------------------------------------------
commit 2f95ada1494b19eec02e86eaf3f9270fa8b08318
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 21 09:50:53 2016 +0200

    ctdb: fix autotest with socket-wrapper installed in the system
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Jul 11 15:53:30 CEST 2016 on sn-devel-144

commit c1c2a1cb9f2e25da3e674abda02227cc7e3a8b0d
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Jul 8 23:37:18 2016 +1000

    swrap: Build socket_wrapper path relative to blddir
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit b32df94527fe9194366d548edb0ccfdbba9df123
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 11 11:08:22 2016 +0200

    autobuild: Don't compare socket wrapper so_path for xc check
    
    This uses the build-directory which, hence is not the same.
    Achieve this by adding the path itself and the whole
    defines dictionary to the exclude list.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 ctdb/wscript                 | 4 +++-
 lib/socket_wrapper/wscript   | 4 ++--
 script/compare_cc_results.py | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index 3eae066..f3a1901 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -107,6 +107,7 @@ def configure(conf):
     conf.RECURSE('lib/tdb')
     if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
         conf.RECURSE('lib/socket_wrapper')
+        conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
 
     conf.CHECK_HEADERS('sched.h')
     conf.CHECK_HEADERS('procinfo.h')
@@ -816,7 +817,8 @@ def test(ctx):
 
 
 def autotest(ctx):
-    ld = 'LD_PRELOAD=%s/bin/shared/libsocket-wrapper.so' % os.getcwd()
+    env = samba_utils.LOAD_ENVIRONMENT()
+    ld = 'LD_PRELOAD=%s' % env.SOCKET_WRAPPER_SO_PATH
     cmd = '%s tests/run_tests.sh -e -S -C' % ld
     ret = samba_utils.RUN_COMMAND(cmd)
     if ret != 0:
diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index 4b6e5fa..dbefa83 100644
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -96,8 +96,8 @@ def configure(conf):
                                    define='HAVE_EVENTFD_UNSIGNED_INT', headers='sys/eventfd.h')
 
         # Create full path to socket_wrapper
-        srcdir = os.path.realpath(conf.srcdir)
-        libsocket_wrapper_so_path = srcdir + '/bin/default/lib/socket_wrapper/libsocket-wrapper.so'
+        blddir = os.path.realpath(conf.blddir)
+        libsocket_wrapper_so_path = blddir + '/default/lib/socket_wrapper/libsocket-wrapper.so'
 
     conf.DEFINE('LIBSOCKET_WRAPPER_SO_PATH', libsocket_wrapper_so_path)
     conf.DEFINE('SOCKET_WRAPPER', 1)
diff --git a/script/compare_cc_results.py b/script/compare_cc_results.py
index b8ed399..43b46f8 100755
--- a/script/compare_cc_results.py
+++ b/script/compare_cc_results.py
@@ -8,7 +8,8 @@ import sys
 import difflib
 
 exceptions = ['BUILD_DIRECTORY', 'CROSS_COMPILE', 'CROSS_ANSWERS',
-              'CROSS_EXECUTE', 'SELFTEST_PREFIX']
+              'CROSS_EXECUTE', 'SELFTEST_PREFIX', 'LIBSOCKET_WRAPPER_SO_PATH',
+              'defines' ]
 
 base_lines = list()
 base_fname = ''


-- 
Samba Shared Repository



More information about the samba-cvs mailing list