Andreas Schneider 46102da
From bdcd72b80c90cebed8ae04c2cf55add535abb6af Mon Sep 17 00:00:00 2001
Andreas Schneider 3144ccb
From: Andreas Schneider <asn@samba.org>
Andreas Schneider 3144ccb
Date: Wed, 5 Jul 2017 10:08:49 +0200
Andreas Schneider 3144ccb
Subject: [PATCH] waf: Only build unit tests with selftest enabled
Andreas Schneider 3144ccb
Andreas Schneider 3144ccb
Signed-off-by: Andreas Schneider <asn@samba.org>
Andreas Schneider 3144ccb
---
Andreas Schneider 3144ccb
 wscript       | 2 +-
Andreas Schneider 3144ccb
 wscript_build | 3 ++-
Andreas Schneider 3144ccb
 2 files changed, 3 insertions(+), 2 deletions(-)
Andreas Schneider 3144ccb
Andreas Schneider 3144ccb
diff --git a/wscript b/wscript
Andreas Schneider 3144ccb
index 47d020b..e80f766 100644
Andreas Schneider 3144ccb
--- a/wscript
Andreas Schneider 3144ccb
+++ b/wscript
Andreas Schneider 3144ccb
@@ -195,6 +195,7 @@ def configure(conf):
Andreas Schneider 3144ccb
         if Options.options.with_ntvfs_fileserver == False:
Andreas Schneider 3144ccb
             if not (Options.options.without_ad_dc):
Andreas Schneider 3144ccb
                 raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC')
Andreas Schneider 3144ccb
+        conf.RECURSE('testsuite/unittests')
Andreas Schneider 3144ccb
 
Andreas Schneider 3144ccb
     if Options.options.with_ntvfs_fileserver == True:
Andreas Schneider 3144ccb
         if Options.options.without_ad_dc:
Andreas Schneider 3144ccb
@@ -214,7 +215,6 @@ def configure(conf):
Andreas Schneider 3144ccb
     if conf.env.with_ctdb:
Andreas Schneider 3144ccb
         conf.RECURSE('ctdb')
Andreas Schneider 3144ccb
     conf.RECURSE('lib/socket')
Andreas Schneider 3144ccb
-    conf.RECURSE('testsuite/unittests')
Andreas Schneider 3144ccb
     conf.RECURSE('auth')
Andreas Schneider 3144ccb
 
Andreas Schneider 3144ccb
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
Andreas Schneider 3144ccb
diff --git a/wscript_build b/wscript_build
Andreas Schneider 46102da
index 2ddcdcc..8758b6d 100644
Andreas Schneider 3144ccb
--- a/wscript_build
Andreas Schneider 3144ccb
+++ b/wscript_build
Andreas Schneider 3144ccb
@@ -124,7 +124,8 @@ bld.RECURSE('libcli/samsync')
Andreas Schneider 3144ccb
 bld.RECURSE('libcli/registry')
Andreas Schneider 3144ccb
 bld.RECURSE('source4/lib/policy')
Andreas Schneider 3144ccb
 bld.RECURSE('libcli/named_pipe_auth')
Andreas Schneider 3144ccb
-bld.RECURSE('testsuite/unittests')
Andreas Schneider 46102da
+if bld.CONFIG_GET('ENABLE_SELFTEST'):
Andreas Schneider 3144ccb
+    bld.RECURSE('testsuite/unittests')
Andreas Schneider 3144ccb
 
Andreas Schneider 3144ccb
 if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
Andreas Schneider 3144ccb
     if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"):
Andreas Schneider 3144ccb
-- 
Andreas Schneider 3144ccb
2.9.4
Andreas Schneider 3144ccb