summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-10-25 14:58:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:39 -0500
commitbc596cf917a25569f71d7d2b72ba11f3cb34dd54 (patch)
treee91562b93162903a6c1c3925d966f6226d49f6bb /source4/torture
parentf8afc52ed0125e15d1ea05e79a0f86077dc92ddd (diff)
downloadsamba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.tar.gz
samba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.tar.bz2
samba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.zip
r19495: Stop linking binaries twice (once before installation, once during build).
Make TORTURE-TALLOC and TORTURE-REPLACE builtin again rather than separate binaries. (This used to be commit 8913d60c72a67b041b08d569c9bd048953106c85)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/local/config.mk3
-rw-r--r--source4/torture/local/local.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 55659447ec..9917dcb128 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -12,6 +12,9 @@ OBJ_FILES = \
../../lib/crypto/hmacmd5test.o \
../../lib/crypto/sha1test.o \
../../lib/crypto/hmacsha1test.o \
+ ../../lib/talloc/testsuite.o \
+ ../../lib/replace/test/os2_delete.o \
+ ../../lib/replace/test/testsuite.o \
messaging.o \
binding_string.o \
idtree.o \
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 3846c3b18c..47a91c96f7 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -53,6 +53,9 @@ NTSTATUS torture_local_init(void)
talloc_autofree_context(),
"LOCAL");
+ torture_suite_add_simple_test(suite, "TALLOC", torture_local_talloc);
+ torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace);
+
torture_suite_add_simple_test(suite, "CRYPTO-SHA1",
torture_local_crypto_sha1);
torture_suite_add_simple_test(suite,