[SCM] Samba Shared Repository - branch master updated - b7e2c74cef708dfaf7a22de8d68382b9a5f2cf57

[Stefan Metzmacher]

The branch, master has been updated
       via  b7e2c74cef708dfaf7a22de8d68382b9a5f2cf57 (commit)
       via  2019a98e4603ad5e201c9ed297baafc3373c1fba (commit)
      from  2c7cbb6b1d54c0463fd788002190ee673179f7c1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b7e2c74cef708dfaf7a22de8d68382b9a5f2cf57
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Sep 22 00:21:26 2008 +0200

    s3: link @tallocdir@/testsuite_main.o into talloctort
    
    metze

commit 2019a98e4603ad5e201c9ed297baafc3373c1fba
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Sep 22 00:20:39 2008 +0200

    lib/talloc: move main() out of testsuite.c
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/talloc/talloc.mk                               |    6 +++---
 lib/talloc/testsuite.c                             |   10 ----------
 .../test/main.c => talloc/testsuite_main.c}        |   14 +++++++-------
 source3/Makefile.in                                |    4 ++--
 4 files changed, 12 insertions(+), 22 deletions(-)
 copy lib/{replace/test/main.c => talloc/testsuite_main.c} (81%)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk
index 23331b6..f183cd5 100644
--- a/lib/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
@@ -5,8 +5,8 @@ TALLOC_SONAME = libtalloc.$(SHLIBEXT).1
 
 all:: libtalloc.a $(TALLOC_SOLIB) testsuite
 
-testsuite:: $(LIBOBJ) testsuite.o
-	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
+testsuite:: $(LIBOBJ) testsuite.o testsuite_main.o
+	$(CC) $(CFLAGS) -o testsuite testsuite.o testsuite_main.o $(LIBOBJ) $(LIBS)
 
 libtalloc.a: $(LIBOBJ)
 	ar -rv $@ $(LIBOBJ)
@@ -28,7 +28,7 @@ install:: all
 doc:: talloc.3 talloc.3.html
 
 clean::
-	rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+	rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o testsuite_main.o *.gc?? talloc.3 talloc.3.html
 
 test:: testsuite
 	./testsuite
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 3f06eee..3d490dd 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -1140,13 +1140,3 @@ bool torture_local_talloc(struct torture_context *tctx)
 
 	return ret;
 }
-
-#if _SAMBA_BUILD_ < 4
-int main(void)
-{
-	bool ret = torture_local_talloc(NULL);
-	if (!ret)
-		return -1;
-	return 0;
-}
-#endif
diff --git a/lib/replace/test/main.c b/lib/talloc/testsuite_main.c
similarity index 81%
copy from lib/replace/test/main.c
copy to lib/talloc/testsuite_main.c
index 9bd1284..1b51333 100644
--- a/lib/replace/test/main.c
+++ b/lib/talloc/testsuite_main.c
@@ -1,9 +1,9 @@
 /*
    Unix SMB/CIFS implementation.
 
-   libreplace tests
+   local testing of talloc routines.
 
-   Copyright (C) Jelmer Vernooij 2006
+   Copyright (C) Andrew Tridgell 2004
 
      ** NOTE! The following LGPL license applies to the talloc
      ** library. This does NOT imply that all of Samba is released
@@ -26,12 +26,12 @@
 #include "replace.h"
 
 struct torture_context;
-bool torture_local_replace(struct torture_context *ctx);
+bool torture_local_talloc(struct torture_context *tctx);
 
 int main(void)
 {
-	bool ret = torture_local_replace(NULL);
-	if (ret)
-		return 0;
-	return -1;
+	bool ret = torture_local_talloc(NULL);
+	if (!ret)
+		return -1;
+	return 0;
 }
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2ae7e15..8304981 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -946,8 +946,8 @@ SHARESEC_OBJ  = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(LIBSAMBA_OBJ) \
                 $(POPT_LIB_OBJ)
 
-TALLOCTORT_OBJ = @tallocdir@/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-                 $(LIBSAMBA_OBJ)
+TALLOCTORT_OBJ = @tallocdir@/testsuite.o @tallocdir@/testsuite_main.o \
+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSAMBA_OBJ)
 
 REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
 		@libreplacedir@/test/getifaddrs.o \


-- 
Samba Shared Repository