svn commit: samba r19034 - in branches/SAMBA_3_0/source/lib/replace/test: .

[metze at samba.org]

Author: metze
Date: 2006-10-02 10:37:17 +0000 (Mon, 02 Oct 2006)
New Revision: 19034

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19034

Log:
merge from samba4:

prepare libreplace testsuite for usage in smbtorture

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/test/testsuite.c
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/test/testsuite.c	2006-10-02 10:35:40 UTC (rev 19033)
+++ branches/SAMBA_3_0/source/lib/replace/test/testsuite.c	2006-10-02 10:37:17 UTC (rev 19034)
@@ -89,7 +89,7 @@
 	char buf[4];
 	const struct {
 		const char *src;
-		int result;
+		size_t result;
 	} tests[] = {
 		{ "abc", 3 },
 		{ "abcdef", 6 },
@@ -373,9 +373,11 @@
 	return true;
 }
 
-int torture_local_replace(void *ctx)
+struct torture_context;
+
+bool torture_local_replace(struct torture_context *torture)
 {
-	int ret = true;
+	bool ret = true;
 	ret &= test_ftruncate();
 	ret &= test_strlcpy();
 	ret &= test_strlcat();
@@ -423,7 +425,7 @@
 	return ret;
 }
 
-#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
+#if _SAMBA_BUILD_<4
 int main(void)
 {
 	if (!torture_local_replace(NULL)) {