diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-12 16:23:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-12 17:42:13 +0000 |
| commit | 5a482a641e9631e269684d4394864659791b5dec (patch) | |
| tree | 34056db675b93cf4511e07cf3df55506e88b0129 | |
| parent | 7e8ea2ca34462669810f540f7b09cd7475a87a7c (diff) | |
| download | samba-5a482a641e9631e269684d4394864659791b5dec.tar.gz samba-5a482a641e9631e269684d4394864659791b5dec.tar.bz2 samba-5a482a641e9631e269684d4394864659791b5dec.zip | |
torture: Only add in tests for socket_wrapper/nss_wrapper when they have been enabled.
| -rw-r--r-- | source4/torture/local/local.c | 4 | ||||
| -rw-r--r-- | source4/torture/local/wscript_build | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 84cdc95ea4..2f29c35fb2 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -45,8 +45,12 @@ torture_local_genrand, torture_local_iconv, torture_local_socket, +#ifdef SOCKET_WRAPPER torture_local_socket_wrapper, +#endif +#ifdef NSS_WRAPPER torture_local_nss_wrapper, +#endif torture_pac, torture_local_resolve, torture_local_sddl, diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index 1c4c94bdfd..dff75bf02f 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -1,10 +1,22 @@ #!/usr/bin/env python +TORTURE_LOCAL_SOURCE = '../../../lib/util/charset/tests/iconv.c ../../../lib/talloc/testsuite.c ../../lib/messaging/tests/messaging.c ../../lib/messaging/tests/irpc.c ../../librpc/tests/binding_string.c ../../../lib/util/tests/idtree.c ../../../lib/util/tests/dlinklist.c ../../lib/socket/testsuite.c ../../libcli/resolve/testsuite.c ../../../lib/util/tests/strlist.c ../../../lib/util/tests/parmlist.c ../../../lib/util/tests/str.c ../../../lib/util/tests/time.c ../../../lib/util/tests/asn1_tests.c ../../../lib/util/tests/data_blob.c ../../../lib/util/tests/file.c ../../../lib/util/tests/genrand.c ../../../lib/compression/testsuite.c ../../../lib/util/charset/tests/charset.c ../../libcli/security/tests/sddl.c ../../../lib/tdr/testsuite.c ../../../lib/tevent/testsuite.c ../../param/tests/share.c ../../param/tests/loadparm.c ../../auth/credentials/tests/simple.c local.c dbspeed.c torture.c ../ldb/ldb.c ../../dsdb/common/tests/dsdb_dn.c ../../dsdb/schema/tests/schema_syntax.c' + +TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb replace-test' + +if bld.CONFIG_SET("NSS_WRAPPER"): + TORTURE_LOCAL_SOURCE += " ../../../lib/nss_wrapper/testsuite.c" + TORTURE_LOCAL_DEPS += " nss_wrapper " + +if bld.CONFIG_SET("SOCKET_WRAPPER"): + TORTURE_LOCAL_SOURCE += " ../../../lib/socket_wrapper/testsuite.c" + TORTURE_LOCAL_DEPS += " socket_wrapper" + bld.SAMBA_MODULE('TORTURE_LOCAL', - source='../../../lib/util/charset/tests/iconv.c ../../../lib/talloc/testsuite.c ../../lib/messaging/tests/messaging.c ../../lib/messaging/tests/irpc.c ../../librpc/tests/binding_string.c ../../../lib/util/tests/idtree.c ../../../lib/util/tests/dlinklist.c ../../lib/socket/testsuite.c ../../../lib/socket_wrapper/testsuite.c ../../../lib/nss_wrapper/testsuite.c ../../libcli/resolve/testsuite.c ../../../lib/util/tests/strlist.c ../../../lib/util/tests/parmlist.c ../../../lib/util/tests/str.c ../../../lib/util/tests/time.c ../../../lib/util/tests/asn1_tests.c ../../../lib/util/tests/data_blob.c ../../../lib/util/tests/file.c ../../../lib/util/tests/genrand.c ../../../lib/compression/testsuite.c ../../../lib/util/charset/tests/charset.c ../../libcli/security/tests/sddl.c ../../../lib/tdr/testsuite.c ../../../lib/tevent/testsuite.c ../../param/tests/share.c ../../param/tests/loadparm.c ../../auth/credentials/tests/simple.c local.c dbspeed.c torture.c ../ldb/ldb.c ../../dsdb/common/tests/dsdb_dn.c ../../dsdb/schema/tests/schema_syntax.c', + source=TORTURE_LOCAL_SOURCE, autoproto='proto.h', subsystem='smbtorture', init_function='torture_local_init', - deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb nss_wrapper socket_wrapper replace-test', + deps=TORTURE_LOCAL_DEPS, internal_module=True ) |