summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildtools/wafsamba/wafsamba.py6
-rw-r--r--lib/async_req/wscript_build2
-rw-r--r--lib/audit_logging/wscript_build8
-rw-r--r--lib/pthreadpool/wscript_build4
-rw-r--r--lib/texpect/wscript2
-rw-r--r--lib/util/wscript_build8
-rw-r--r--libcli/auth/wscript_build8
-rw-r--r--libcli/dns/wscript_build4
-rw-r--r--libcli/drsuapi/wscript_build23
-rw-r--r--libcli/nbt/wscript_build2
-rw-r--r--libcli/smb/wscript2
-rw-r--r--nsswitch/wscript_build4
-rw-r--r--source3/modules/wscript_build2
-rw-r--r--source3/wscript_build26
-rw-r--r--source4/auth/wscript_build2
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build6
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build_server10
-rw-r--r--source4/rpc_server/wscript_build17
18 files changed, 69 insertions, 67 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7460fbae020..5bbcc156fe7 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -361,9 +361,13 @@ def SAMBA_BINARY(bld, binname, source,
install=True,
install_path=None,
enabled=True,
- fuzzer=False):
+ fuzzer=False,
+ for_selftest=False):
'''define a Samba binary'''
+ if for_selftest and not bld.CONFIG_GET('ENABLE_SELFTEST'):
+ enabled=False
+
if not enabled:
SET_TARGET_TYPE(bld, binname, 'DISABLED')
return
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index bf79fdd24d1..4486a5b2f06 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -10,5 +10,5 @@ bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
bld.SAMBA_BINARY('async_connect_send_test',
source='async_connect_send_test.c',
deps='LIBASYNC_REQ',
- install=False
+ for_selftest=True
)
diff --git a/lib/audit_logging/wscript_build b/lib/audit_logging/wscript_build
index 4811e056b72..125c94bad90 100644
--- a/lib/audit_logging/wscript_build
+++ b/lib/audit_logging/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM(
source='audit_logging.c'
)
-if bld.AD_DC_BUILD_IS_ENABLED() and bld.CONFIG_GET('ENABLE_SELFTEST'):
+if bld.AD_DC_BUILD_IS_ENABLED():
bld.SAMBA_BINARY(
'audit_logging_test',
source='tests/audit_logging_test.c',
@@ -21,10 +21,10 @@ if bld.AD_DC_BUILD_IS_ENABLED() and bld.CONFIG_GET('ENABLE_SELFTEST'):
samba-util
LIBTSOCKET
''',
- install=False
+ for_selftest=True
)
-if bld.AD_DC_BUILD_IS_ENABLED() and bld.CONFIG_GET('ENABLE_SELFTEST'):
+if bld.AD_DC_BUILD_IS_ENABLED():
bld.SAMBA_BINARY(
'audit_logging_error_test',
source='tests/audit_logging_error_test.c',
@@ -36,7 +36,7 @@ if bld.AD_DC_BUILD_IS_ENABLED() and bld.CONFIG_GET('ENABLE_SELFTEST'):
samba-util
LIBTSOCKET
''',
- install=False,
+ for_selftest=True,
ldflags='''
-Wl,--wrap,json_object_set_new
-Wl,--wrap,json_object_update
diff --git a/lib/pthreadpool/wscript_build b/lib/pthreadpool/wscript_build
index 70aa7cbf041..e270f90333f 100644
--- a/lib/pthreadpool/wscript_build
+++ b/lib/pthreadpool/wscript_build
@@ -25,11 +25,11 @@ bld.SAMBA_BINARY('pthreadpooltest',
source='tests.c',
deps='PTHREADPOOL',
enabled=bld.env.WITH_PTHREADPOOL,
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('pthreadpooltest_cmocka',
source='tests_cmocka.c',
deps='PTHREADPOOL cmocka',
ldflags='-Wl,--wrap=pthread_create',
enabled=bld.env.WITH_PTHREADPOOL and bld.env['HAVE_LDWRAP'],
- install=False)
+ for_selftest=True)
diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index e14c048483f..aaa3104f1ed 100644
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -4,4 +4,4 @@ def configure(conf):
conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h')
def build(bld):
- bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util replace', install=False)
+ bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util replace', for_selftest=True)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7d446d810d1..3a80b93b2c7 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -269,22 +269,22 @@ else:
source='tests/rfc1738.c',
deps='cmocka replace samba-util',
local_include=False,
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_ms_fnmatch',
source='tests/test_ms_fnmatch.c',
deps='cmocka replace samba-util',
local_include=False,
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_talloc_keep_secret',
source='tests/test_talloc_keep_secret.c',
deps='cmocka replace samba-util',
local_include=False,
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_byteorder',
source='tests/test_byteorder.c',
deps='cmocka replace samba-util',
local_include=False,
- install=False)
+ for_selftest=True)
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index f1d513e6449..c99ea4464af 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -52,7 +52,7 @@ bld.SAMBA_BINARY(
cmocka
talloc
''',
- install=False
+ for_selftest=True
)
bld.SAMBA_BINARY('test_rc4_passwd_buffer',
@@ -62,7 +62,7 @@ bld.SAMBA_BINARY('test_rc4_passwd_buffer',
LIBCLI_AUTH
cmocka
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_schannel',
source='tests/test_schannel.c',
@@ -70,7 +70,7 @@ bld.SAMBA_BINARY('test_schannel',
gensec
cmocka
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_gnutls',
source='tests/test_gnutls.c',
@@ -79,4 +79,4 @@ bld.SAMBA_BINARY('test_gnutls',
cmocka
samba-util
''',
- install=False)
+ for_selftest=True)
diff --git a/libcli/dns/wscript_build b/libcli/dns/wscript_build
index ea745c14028..2d90aa7ec0f 100644
--- a/libcli/dns/wscript_build
+++ b/libcli/dns/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_BINARY('resolvconftest',
source='resolvconftest.c',
deps='clidns',
enabled=bld.CONFIG_SET('HAVE_FMEMOPEN'),
- install=False)
+ for_selftest=True)
bld.SAMBA_SUBSYSTEM('dns_lookup',
source='dns_lookup.c',
@@ -18,4 +18,4 @@ bld.SAMBA_SUBSYSTEM('dns_lookup',
bld.SAMBA_BINARY('dns_lookuptest',
source='dns_lookuptest.c',
deps='dns_lookup',
- install=False)
+ for_selftest=True)
diff --git a/libcli/drsuapi/wscript_build b/libcli/drsuapi/wscript_build
index 271248215be..1aee095130c 100644
--- a/libcli/drsuapi/wscript_build
+++ b/libcli/drsuapi/wscript_build
@@ -6,15 +6,14 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DRSUAPI',
public_deps='LIBCLI_AUTH samdb z'
)
-if bld.CONFIG_GET('ENABLE_SELFTEST'):
- bld.SAMBA_BINARY(
- 'test_repl_decrypt',
- source='tests/test_repl_decrypt.c',
- deps='''
- LIBCLI_DRSUAPI
- cmocka
- talloc
- ''',
- install=False,
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
- )
+bld.SAMBA_BINARY(
+ 'test_repl_decrypt',
+ source='tests/test_repl_decrypt.c',
+ deps='''
+ LIBCLI_DRSUAPI
+ cmocka
+ talloc
+ ''',
+ for_selftest=True,
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
+)
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 090789ce99a..15610765268 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -21,7 +21,7 @@ bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
source='tools/nmblookup.c',
manpages='man/nmblookup4.1',
deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE',
- install=False
+ install=False,
)
bld.SAMBA_PYTHON('python_netbios',
diff --git a/libcli/smb/wscript b/libcli/smb/wscript
index 2fad5ee37c3..66c2b9b7e70 100644
--- a/libcli/smb/wscript
+++ b/libcli/smb/wscript
@@ -69,4 +69,4 @@ def build(bld):
bld.SAMBA_BINARY('test_smb1cli_session',
source='test_smb1cli_session.c',
deps='cmocka cli_smb_common',
- install=False)
+ for_selftest=True)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 861ed2f23bf..b754c168425 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -14,14 +14,14 @@ bld.SAMBA_LIBRARY('winbind-client',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
deps='replace dl',
- install=False
+ for_selftest=True
)
if bld.CONFIG_SET('HAVE_PTHREAD'):
bld.SAMBA_BINARY('stress-nss-libwbclient',
source='stress-nss-libwbclient.c',
deps='wbclient pthread',
- install=False
+ for_selftest=True
)
# The nss_wrapper code relies strictly on the linux implementation and
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index e4f92fac150..cb0c083fcc8 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -7,7 +7,7 @@ bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
bld.SAMBA3_BINARY('test_nfs4_acls',
source='test_nfs4_acls.c',
deps='smbd_base cmocka',
- install=False)
+ for_selftest=True)
bld.SAMBA3_SUBSYSTEM('vfs_acl_common',
source='vfs_acl_common.c',
diff --git a/source3/wscript_build b/source3/wscript_build
index 1cf734fe4c7..8d0cc66f941 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -112,7 +112,7 @@ bld.SAMBA3_BINARY('test_tldap',
smbconf
cmocka
''',
- install=False)
+ for_selftest=True)
# libpdb.so should not expose internal symbols that are only usable
# to the statically linked modules that are merged into libpdb.
@@ -207,7 +207,7 @@ bld.SAMBA_BINARY('test_registry_regfio',
source='registry/tests/test_regfio.c',
deps='cmocka samba3-util smbconf REGFIO',
local_include=False,
- install=False)
+ for_selftest=True)
# Do not link against this use 'smbconf'
bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
@@ -1158,7 +1158,7 @@ bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
bld.SAMBA3_BINARY('smbspool_argv_wrapper',
source='script/tests/smbspool_argv_wrapper.c',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('locktest2',
source='torture/locktest2.c',
@@ -1168,7 +1168,7 @@ bld.SAMBA3_BINARY('locktest2',
libsmb
LOCKING
''',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source='''
@@ -1225,7 +1225,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
samba-cluster-support
''',
cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('smbconftort',
source='lib/smbconf/testsuite.c',
@@ -1234,7 +1234,7 @@ bld.SAMBA3_BINARY('smbconftort',
smbconf
popt_samba3
''',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('msgtest',
source='torture/msgtest.c',
@@ -1276,7 +1276,7 @@ bld.SAMBA3_BINARY('test_mdsparser_es',
popt_samba3_cmdline
''',
enabled=bld.env.spotlight_backend_es,
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('pdbtest',
source='torture/pdbtest.c',
@@ -1287,7 +1287,7 @@ bld.SAMBA3_BINARY('pdbtest',
AUTH_COMMON
auth
''',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('vfstest',
source='''
@@ -1301,7 +1301,7 @@ bld.SAMBA3_BINARY('vfstest',
smbconf
SMBREADLINE
''',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
@@ -1313,7 +1313,7 @@ bld.SAMBA3_BINARY('versiontest',
bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('rpc_open_tcp',
source='torture/rpc_open_tcp.c',
@@ -1321,7 +1321,7 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
talloc
msrpc3
''',
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('vlp',
source='printing/tests/vlp.c',
@@ -1329,7 +1329,7 @@ bld.SAMBA3_BINARY('vlp',
talloc
smbconf
''',
- install=False)
+ for_selftest=True)
pyrpc_util = bld.pyembed_libname('pyrpc_util')
@@ -1380,7 +1380,7 @@ bld.SAMBA3_BINARY('tevent_glib_glue_test',
popt_samba3
tevent-glib-glue''',
enabled=bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE'),
- install=False)
+ for_selftest=True)
bld.SAMBA3_BINARY('tevent_glib_tracker',
source='utils/async-tracker.c',
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index daf5c8a422d..381a7b19bf0 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -46,7 +46,7 @@ bld.SAMBA_BINARY('test_kerberos',
source='tests/kerberos.c',
deps='cmocka authkrb5 krb5samba com_err CREDENTIALS_KRB5',
local_include=False,
- install=False
+ for_selftest=True
)
pytalloc_util = bld.pyembed_libname('pytalloc-util')
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 89629ab1cb8..c3e8b54f0ba 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -27,7 +27,7 @@ bld.SAMBA_BINARY('test_unique_object_sids',
cmocka
DSDB_MODULE_HELPERS
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_encrypted_secrets_tdb',
source='tests/test_encrypted_secrets.c',
cflags='-DTEST_BE=\"tdb\"',
@@ -40,7 +40,7 @@ bld.SAMBA_BINARY('test_encrypted_secrets_tdb',
gnutls
DSDB_MODULE_HELPERS
''',
- install=False)
+ for_selftest=True)
if conf.env.HAVE_LMDB:
bld.SAMBA_BINARY('test_encrypted_secrets_mdb',
source='tests/test_encrypted_secrets.c',
@@ -54,7 +54,7 @@ if conf.env.HAVE_LMDB:
gnutls
DSDB_MODULE_HELPERS
''',
- install=False)
+ for_selftest=True)
if bld.AD_DC_BUILD_IS_ENABLED():
bld.PROCESS_SEPARATE_RULE("server")
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index 2eec7c4fa7d..4d0febc7152 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -21,7 +21,7 @@ bld.SAMBA_BINARY('test_audit_util',
audit_logging
DSDB_MODULE_HELPERS
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_audit_log',
source='tests/test_audit_log.c',
@@ -35,7 +35,7 @@ bld.SAMBA_BINARY('test_audit_log',
DSDB_MODULE_HELPERS
DSDB_MODULE_HELPERS_AUDIT
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_audit_log_errors',
source='tests/test_audit_log_errors.c',
@@ -54,7 +54,7 @@ bld.SAMBA_BINARY('test_audit_log_errors',
-Wl,--wrap,json_add_version
-Wl,--wrap,json_add_timestamp
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_group_audit',
source='tests/test_group_audit.c',
@@ -68,7 +68,7 @@ bld.SAMBA_BINARY('test_group_audit',
DSDB_MODULE_HELPERS
DSDB_MODULE_HELPERS_AUDIT
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_BINARY('test_group_audit_errors',
source='tests/test_group_audit_errors.c',
@@ -87,7 +87,7 @@ bld.SAMBA_BINARY('test_group_audit_errors',
-Wl,--wrap,json_add_version
-Wl,--wrap,json_add_timestamp
''',
- install=False)
+ for_selftest=True)
bld.SAMBA_MODULE('ldb_samba_dsdb',
source='samba_dsdb.c',
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 8d896c1722f..186e6a269e5 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -167,16 +167,15 @@ bld.SAMBA_MODULE('service_dcerpc',
deps='dcerpc_server'
)
-if bld.CONFIG_GET('ENABLE_SELFTEST'):
- bld.SAMBA_BINARY(
- 'test_rpc_dns_server_dnsutils',
- source='tests/rpc_dns_server_dnsutils_test.c',
- deps='''
+bld.SAMBA_BINARY(
+ 'test_rpc_dns_server_dnsutils',
+ source='tests/rpc_dns_server_dnsutils_test.c',
+ deps='''
dnsserver_common
dcerpc_server
cmocka
talloc
- ''',
- install=False,
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
- )
+ ''',
+ for_selftest=True,
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
+)
View Lorry Controller Status