[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Wed Jul 5 20:22:02 UTC 2017


The branch, master has been updated
       via  1de4390 unittests: Do not install the test_dummy rpc module
       via  5d18c5e unittests: Add missing stdint.h include
       via  25ef27b waf: Only build unit tests with selftest enabled
      from  e3707c1 Add code to run the tests for 'samba-tool user edit'

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


- Log -----------------------------------------------------------------
commit 1de439035308b80a6bedc8110d02a4c29388c975
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jul 5 10:30:35 2017 +0200

    unittests: Do not install the test_dummy rpc module
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12879
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Jul  5 22:21:06 CEST 2017 on sn-devel-144

commit 5d18c5e5ec52a185991f9de6883171f85f7d4fa7
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jul 5 08:59:23 2017 +0200

    unittests: Add missing stdint.h include
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12878
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit 25ef27b2e6d80f0afa271e73a195caa2105be648
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jul 5 10:08:49 2017 +0200

    waf: Only build unit tests with selftest enabled
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12877
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 testsuite/unittests/test_sambafs_srv_pipe.c | 1 +
 testsuite/unittests/wscript                 | 3 ++-
 wscript                                     | 2 +-
 wscript_build                               | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testsuite/unittests/test_sambafs_srv_pipe.c b/testsuite/unittests/test_sambafs_srv_pipe.c
index 641e99d..553f530 100644
--- a/testsuite/unittests/test_sambafs_srv_pipe.c
+++ b/testsuite/unittests/test_sambafs_srv_pipe.c
@@ -2,6 +2,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <cmocka.h>
diff --git a/testsuite/unittests/wscript b/testsuite/unittests/wscript
index ba6ad3c..561cb4b 100644
--- a/testsuite/unittests/wscript
+++ b/testsuite/unittests/wscript
@@ -34,4 +34,5 @@ def build(bld):
                      subsystem='rpc',
                      allow_undefined_symbols=True,
                      init_function='',
-                     internal_module=False)
+                     internal_module=False,
+                     install=False)
diff --git a/wscript b/wscript
index 47d020b..e80f766 100644
--- a/wscript
+++ b/wscript
@@ -195,6 +195,7 @@ def configure(conf):
         if Options.options.with_ntvfs_fileserver == False:
             if not (Options.options.without_ad_dc):
                 raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC')
+        conf.RECURSE('testsuite/unittests')
 
     if Options.options.with_ntvfs_fileserver == True:
         if Options.options.without_ad_dc:
@@ -214,7 +215,6 @@ def configure(conf):
     if conf.env.with_ctdb:
         conf.RECURSE('ctdb')
     conf.RECURSE('lib/socket')
-    conf.RECURSE('testsuite/unittests')
     conf.RECURSE('auth')
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
diff --git a/wscript_build b/wscript_build
index 2ddcdcc..8758b6d 100644
--- a/wscript_build
+++ b/wscript_build
@@ -124,7 +124,8 @@ bld.RECURSE('libcli/samsync')
 bld.RECURSE('libcli/registry')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')
-bld.RECURSE('testsuite/unittests')
+if bld.CONFIG_GET('ENABLE_SELFTEST'):
+    bld.RECURSE('testsuite/unittests')
 
 if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
     if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"):


-- 
Samba Shared Repository



More information about the samba-cvs mailing list