Skip to content

Commit

Permalink
waf: Only build unit tests with selftest enabled
Browse files Browse the repository at this point in the history
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12877

Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
  • Loading branch information
cryptomilk committed Jul 5, 2017
1 parent e3707c1 commit 25ef27b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion wscript_build
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down

0 comments on commit 25ef27b

Please sign in to comment.