From d6299d2667909487986782afc596cca45f2cbdac Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 27 Oct 2010 14:25:39 +1100 Subject: replace: create a private replace-test library used by replace_testuite and smbtorture --- lib/replace/wscript | 13 ++++++++----- source4/torture/local/local.c | 1 + source4/torture/local/wscript_build | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index 8786eca872..9340ded1a9 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -407,13 +407,16 @@ def build(bld): private_library=True, deps='crypt dl nsl socket rt') - TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c - test/os2_delete.c test/getifaddrs.c''' - + bld.SAMBA_LIBRARY('replace-test', + source='''test/testsuite.c test/strptime.c + test/os2_delete.c test/getifaddrs.c''', + autoproto='replace-test.h', + deps='replace', + private_library=True) bld.SAMBA_BINARY('replace_testsuite', - TEST_SOURCES, - deps='replace', + source='test/main.c', + deps='replace replace-test', install=False) # build replacements for stdint.h and stdbool.h if needed diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 054f6a5a0d..84cdc95ea4 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -24,6 +24,7 @@ #include "torture/auth/proto.h" #include "../lib/crypto/test_proto.h" #include "lib/registry/tests/proto.h" +#include "lib/replace/replace-test.h" /* ignore me */ static struct torture_suite * (*suite_generators[]) (TALLOC_CTX *mem_ctx) = diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index 894697ecad..a57d6f8fee 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -1,10 +1,10 @@ #!/usr/bin/env python bld.SAMBA_MODULE('TORTURE_LOCAL', - source='../../../lib/util/charset/tests/iconv.c ../../../lib/talloc/testsuite.c ../../../lib/replace/test/getifaddrs.c ../../../lib/replace/test/os2_delete.c ../../../lib/replace/test/strptime.c ../../../lib/replace/test/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='../../../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', 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', + 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', internal_module=True ) -- cgit