From: Andreas Schneider Date: Wed, 5 Jul 2017 08:08:49 +0000 (+0200) Subject: waf: Only build unit tests with selftest enabled X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=25ef27b2e6d80f0afa271e73a195caa2105be648 waf: Only build unit tests with selftest enabled BUG: https://bugzilla.samba.org/show_bug.cgi?id=12877 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy --- diff --git a/wscript b/wscript index 47d020b12235..e80f7663bbd7 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 2ddcdcc85570..8758b6d57898 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"):