From bc596cf917a25569f71d7d2b72ba11f3cb34dd54 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 25 Oct 2006 14:58:05 +0000
Subject: 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)

---
 source4/lib/talloc/config.mk   |  5 -----
 source4/lib/talloc/testsuite.c | 11 ++++++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source4/lib/talloc')

diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 0b06687dab..714ad72d1c 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -11,8 +11,3 @@ DESCRIPTION = A hierarchical pool based memory system with destructors
 #
 # End LIBRARY LIBTALLOC
 ################################################
-
-[BINARY::TALLOC]
-OBJ_FILES = testsuite.o
-PRIVATE_DEPENDENCIES = LIBTALLOC
-INSTALLDIR = TORTUREDIR/LOCAL
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 4904b21f9b..8f2a211b47 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -1025,7 +1025,8 @@ static bool test_autofree(void)
 	return true;
 }
 
-int main(void)
+struct torture_context;
+bool torture_local_talloc(struct torture_context *tctx)
 {
 	bool ret = true;
 
@@ -1057,7 +1058,15 @@ int main(void)
 	}
 	ret &= test_autofree();
 
+	return ret;
+}
+
+#ifndef _SAMBA_BUILD_
+int main(void)
+{
+	bool ret = torture_local_talloc(NULL);
 	if (!ret)
 		return -1;
 	return 0;
 }
+#endif
-- 
cgit