From f54dcc86b8c04bfd3c85ad327d268f5e32dd2cfd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 26 Oct 2011 09:28:08 +1100
Subject: s3-torture remove unused t_push_ucs2.c t_strcmp.c t_strstr.c

These tests were incorportated into
source4/scripting/python/samba/tests/strings.py with
fa3e2fc8bb3e935c65b7043382cad1d649cb68a6.

Andrew Bartlett
---
 source3/Makefile.in           |  8 -------
 source3/torture/t_push_ucs2.c | 55 -------------------------------------------
 source3/torture/t_strcmp.c    | 32 -------------------------
 source3/torture/t_strstr.c    | 38 ------------------------------
 4 files changed, 133 deletions(-)
 delete mode 100644 source3/torture/t_push_ucs2.c
 delete mode 100644 source3/torture/t_strcmp.c
 delete mode 100644 source3/torture/t_strstr.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 502dab7c26..f65e4aba2e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3183,14 +3183,6 @@ bin/tdbtorture@EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTD
 	@$(CC) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/t_strcmp@EXEEXT@: $(BINARY_PREREQS) $(LIBTALLOC) bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o
-	$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
-		torture/t_strcmp.o -L ./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
-
-bin/t_strstr@EXEEXT@: $(BINARY_PREREQS) $(LIBTALLOC) bin/libbigballofmud.@SHLIBEXT@ torture/t_strstr.o
-	$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
-		torture/t_strstr.o -L ./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
-
 bin/t_strappend@EXEEXT@: $(BINARY_PREREQS) $(LIBTALLOC) bin/libbigballofmud.@SHLIBEXT@ torture/t_strappend.o
 	$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
 		torture/t_strappend.o -L ./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
diff --git a/source3/torture/t_push_ucs2.c b/source3/torture/t_push_ucs2.c
deleted file mode 100644
index 4e22eeab8b..0000000000
--- a/source3/torture/t_push_ucs2.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2003 by Martin Pool
- * Copyright (C) 2003 by Andrew Bartlett
- *
- * Test harness for push_ucs2
- */
-
-#include "includes.h"
-
-static int check_push_ucs2(const char *orig) 
-{
-	smb_ucs2_t *dest = NULL;
-	char *orig2 = NULL;
-	int ret;
-	size_t converted_size;
-
-	push_ucs2_talloc(NULL, &dest, orig, &converted_size);
-	pull_ucs2_talloc(NULL, &orig2, dest, &converted_size);
-	ret = strcmp(orig, orig2);
-	if (ret) {
-		fprintf(stderr, "orig: %s\n", orig);
-		fprintf(stderr, "orig (UNIX -> UCS2 -> UNIX): %s\n", orig2);
-	}
-
-	TALLOC_FREE(dest);
-	TALLOC_FREE(orig2);
-
-	return ret;
-}
-
-int main(int argc, char *argv[])
-{
-	int i, ret = 0;
-	int count = 1;
-
-	/* Needed to initialize character set */
-	lp_load_global("/dev/null");
-
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s STRING1 [COUNT]\n"
-			"Checks that a string translated UNIX->UCS2->UNIX is unchanged\n"
-			"Should be always 0\n",
-			argv[0]);
-		return 2;
-	}
-	if (argc >= 3)
-		count = atoi(argv[2]);
-
-	for (i = 0; ((i < count) && (!ret)); i++)
-		ret = check_push_ucs2(argv[1]);
-
-	printf("%d\n", ret);
-	
-	return 0;
-}
diff --git a/source3/torture/t_strcmp.c b/source3/torture/t_strcmp.c
deleted file mode 100644
index e6828e4210..0000000000
--- a/source3/torture/t_strcmp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2003 by Martin Pool
- *
- * Test harness for strcasecmp_m
- */
-
-#include "includes.h"
-
-int main(int argc, char *argv[])
-{
-	int i, ret;
-	int iters = 1;
-	
-	/* Needed to initialize character set */
-	lp_load_global("/dev/null");
-
-	if (argc < 3) {
-		fprintf(stderr, "usage: %s STRING1 STRING2 [ITERS]\n"
-			"Compares two strings, prints the results of strcasecmp_m\n",
-			argv[0]);
-		return 2;
-	}
-	if (argc >= 4)
-		iters = atoi(argv[3]);
-
-	for (i = 0; i < iters; i++)
-		ret = strcasecmp_m(argv[1], argv[2]);
-
-	printf("%d\n", ret);
-	
-	return 0;
-}
diff --git a/source3/torture/t_strstr.c b/source3/torture/t_strstr.c
deleted file mode 100644
index 69b88187d6..0000000000
--- a/source3/torture/t_strstr.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2003 by Martin Pool
- *
- * Test harness for strstr_m
- */
-
-#include "includes.h"
-
-int main(int argc, char *argv[])
-{
-	int i;
-	int iters = 1;
-	
-	const char *ret = NULL;
-
-	/* Needed to initialize character set */
-	lp_load_global("/dev/null");
-
-	if (argc < 3) {
-		fprintf(stderr, "usage: %s STRING1 STRING2 [ITERS]\n"
-			"Compares two strings, prints the results of strstr_m\n",
-			argv[0]);
-		return 2;
-	}
-	if (argc >= 4)
-		iters = atoi(argv[3]);
-
-	for (i = 0; i < iters; i++) {
-		ret = strstr_m(argv[1], argv[2]);
-	}
-
-	if (ret == NULL)
-		ret = "(null)";
-
-	printf("%s\n", ret);
-	
-	return 0;
-}
-- 
cgit