diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-25 14:58:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:39 -0500 |
| commit | bc596cf917a25569f71d7d2b72ba11f3cb34dd54 (patch) | |
| tree | e91562b93162903a6c1c3925d966f6226d49f6bb /source4/lib | |
| parent | f8afc52ed0125e15d1ea05e79a0f86077dc92ddd (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/lib/basic.mk | 1 | ||||
| -rw-r--r-- | source4/lib/replace/test/testsuite.c | 11 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 5 | ||||
| -rw-r--r-- | source4/lib/talloc/testsuite.c | 11 |
4 files changed, 19 insertions, 9 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 4abb2c8430..b5a3a031eb 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -4,7 +4,6 @@ include socket/config.mk include charset/config.mk include ldb/config.mk include talloc/config.mk -include replace/config.mk include tdb/config.mk include tls/config.mk include registry/config.mk 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 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 |