[SCM] Samba Shared Repository - branch master updated - 2c7cbb6b1d54c0463fd788002190ee673179f7c1

[Stefan Metzmacher]

The branch, master has been updated
       via  2c7cbb6b1d54c0463fd788002190ee673179f7c1 (commit)
       via  05525071e0af67b970c0d348a621bc276542f092 (commit)
      from  bc794246df473b2e1a12694671afd51da14af5ad (commit)

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


- Log -----------------------------------------------------------------
commit 2c7cbb6b1d54c0463fd788002190ee673179f7c1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 21 23:46:10 2008 +0200

    s3: link libreplace/test/main.c into replacetort
    
    metze

commit 05525071e0af67b970c0d348a621bc276542f092
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 21 23:59:58 2008 +0200

    libreplace: move main() out of testsuite.c
    
    metze

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

Summary of changes:
 lib/replace/Makefile.in                      |    2 +-
 lib/replace/{system/locale.h => test/main.c} |   33 ++++++++++++-------------
 lib/replace/test/testsuite.c                 |   11 --------
 source3/Makefile.in                          |    1 +
 4 files changed, 18 insertions(+), 29 deletions(-)
 copy lib/replace/{system/locale.h => test/main.c} (71%)


Changeset truncated at 500 lines:

diff --git a/lib/replace/Makefile.in b/lib/replace/Makefile.in
index c889a0e..65f8125 100644
--- a/lib/replace/Makefile.in
+++ b/lib/replace/Makefile.in
@@ -47,7 +47,7 @@ test: all
 
 installcheck: install test
 
-TEST_OBJS = test/testsuite.o test/os2_delete.o test/strptime.o test/getifaddrs.o
+TEST_OBJS = test/main.o test/testsuite.o test/os2_delete.o test/strptime.o test/getifaddrs.o
 
 testsuite: libreplace.a $(TEST_OBJS)
 	$(CC) -o testsuite $(TEST_OBJS) -L. -lreplace $(LDFLAGS) $(LIBS)
diff --git a/lib/replace/system/locale.h b/lib/replace/test/main.c
similarity index 71%
copy from lib/replace/system/locale.h
copy to lib/replace/test/main.c
index e73a9bb..9bd1284 100644
--- a/lib/replace/system/locale.h
+++ b/lib/replace/test/main.c
@@ -1,17 +1,14 @@
-#ifndef _system_locale_h
-#define _system_locale_h
-
-/* 
+/*
    Unix SMB/CIFS implementation.
 
-   locale include wrappers
+   libreplace tests
+
+   Copyright (C) Jelmer Vernooij 2006
 
-   Copyright (C) Andrew Tridgell 2004
-   
-     ** NOTE! The following LGPL license applies to the replace
+     ** NOTE! The following LGPL license applies to the talloc
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -24,15 +21,17 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
 */
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
+#include "replace.h"
 
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
+struct torture_context;
+bool torture_local_replace(struct torture_context *ctx);
 
-#endif
+int main(void)
+{
+	bool ret = torture_local_replace(NULL);
+	if (ret)
+		return 0;
+	return -1;
+}
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index dcb05fb..7929f11 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -1068,14 +1068,3 @@ bool torture_local_replace(struct torture_context *ctx)
 
 	return ret;
 }
-
-#if _SAMBA_BUILD_>3
-#else
-int main(void)
-{
-	bool ret = torture_local_replace(NULL);
-	if (ret) 
-		return 0;
-	return -1;
-}
-#endif
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2300e4a..2ae7e15 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -953,6 +953,7 @@ REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
 		@libreplacedir@/test/getifaddrs.o \
 		@libreplacedir@/test/os2_delete.o \
 		@libreplacedir@/test/strptime.o \
+		@libreplacedir@/test/main.o \
 		$(LIBREPLACE_OBJ)
 
 NDRDUMP_OBJ = librpc/tools/ndrdump.o \


-- 
Samba Shared Repository