sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

selftest: Require jansson support for selftest of the AD DC

Browse Source 
This avoids this code becoming untested if a package is not installed or
the configure test is accidentially broken.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett
2018-02-12 11:03:25 +13:00
parent a12925b6ed
commit 8e54bc463a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
auth/wscript_configure
View File

@ -1,7 +1,16 @@
#!/usr/bin/env python
import Options, Utils
conf.SET_TARGET_TYPE('jansson', 'EMPTY')
if conf.CHECK_CFG(package='jansson', args='--cflags --libs',
msg='Checking for jansson'):
conf.CHECK_FUNCS_IN('json_object', 'jansson')
if not conf.CONFIG_GET('HAVE_JSON_OBJECT') and \
conf.CONFIG_GET('ENABLE_SELFTEST') and \
(not Options.options.without_ad_dc):
raise Utils.WafError('jansson JSON library required for '
'--enable-selftest '
'when building the AD DC')

3
source4/selftest/tests.py
View File

@ -68,7 +68,6 @@ finally:
have_tls_support = ("ENABLE_GNUTLS" in config_hash)
have_heimdal_support = ("SAMBA4_USES_HEIMDAL" in config_hash)
have_jansson_support = ("HAVE_JANSSON" in config_hash)
if have_tls_support:
for options in ['-U"$USERNAME%$PASSWORD"']:
@ -622,7 +621,7 @@ planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.registry", extra
planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.raw_protocol", extra_args=['-U"$USERNAME%$PASSWORD"'])
if have_jansson_support and have_heimdal_support:
if have_heimdal_support:
planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log", extra_args=['-U"$USERNAME%$PASSWORD"'],
environ={'CLIENT_IP': '127.0.0.11',
'SOCKET_WRAPPER_DEFAULT_IFACE': 11})