summaryrefslogtreecommitdiff
path: root/source4/lib/replace
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/lib/replace
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/lib/replace')
-rw-r--r--source4/lib/replace/test/testsuite.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/lib/replace/test/testsuite.c b/source4/lib/replace/test/testsuite.c
index a57247377b..48197cf721 100644
--- a/source4/lib/replace/test/testsuite.c
+++ b/source4/lib/replace/test/testsuite.c
@@ -417,8 +417,7 @@ static int test_socketpair(void)
}
struct torture_context;
-
-int main()
+bool torture_local_replace(struct torture_context *ctx)
{
bool ret = true;
ret &= test_ftruncate();
@@ -466,7 +465,15 @@ int main()
ret &= test_MAX();
ret &= test_socketpair();
+ return ret;
+}
+
+#ifndef _SAMBA_BUILD_
+int main()
+{
+ bool ret = torture_local_replace(NULL);
if (ret)
return 0;
return -1;
}
+#endif