* string/test-string.h: New file.

	* string/test-strlen.c: New file.
	* string/test-string.h: New file.
	* string/test-strcmp.c: New file.
	* string/test-strchr.c: New file.
	* string/test-strrchr.c: New file.
	* string/test-strcpy.c: New file.
	* string/test-stpcpy.c: New file.
	* string/test-strncpy.c: New file.
	* string/test-stpncpy.c: New file.
	* string/test-strpbrk.c: New file.
	* string/test-strcspn.c: New file.
	* string/test-strspn.c: New file.
	* string/test-strcat.c: New file.
	* string/test-strncmp.c: New file.
	* string/test-memchr.c: New file.
	* string/test-memcmp.c: New file.
	* string/test-memset.c: New file.
	* string/test-memcpy.c: New file.
	* string/test-mempcpy.c: New file.
	* string/test-memmove.c: New file.
	* string/Makefile (strop-tests): New variable.
	(tests): Add strop-tests.
	(distribute): Add test-string.h.

1 files changed, 213 insertions, 0 deletions

diff --git a/string/test-strspn.c b/string/test-strspn.c
new file mode 100644
index 0000000000..00e30b4657
--- /dev/null
+++ b/string/test-strspn.c
@@ -0,0 +1,213 @@
+/* Test and measure strspn functions.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Jakub Jelinek <jakub@redhat.com>, 1999.
+
+   The GNU C 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
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#define TEST_MAIN
+#include "test-string.h"
+
+typedef size_t (*proto_t) (const char *, const char *);
+size_t simple_strspn (const char *, const char *);
+
+IMPL (simple_strspn, 0)
+IMPL (strspn, 1)
+
+size_t
+simple_strspn (const char *s, const char *rej)
+{
+  const char *r, *str = s;
+  char c;
+
+  while ((c = *s++) != '\0')
+    {
+      for (r = rej; *r != '\0'; ++r)
+	if (*r == c)
+	  break;
+      if (*r == '\0')
+	return s - str - 1;
+    }
+  return s - str - 1;
+}
+
+static void
+do_one_test (impl_t *impl, const char *s, const char *acc, size_t exp_res)
+{
+  size_t res = CALL (impl, s, acc);
+  if (res != exp_res)
+    {
+      error (0, 0, "Wrong result in function %s %p %p", impl->name,
+	     (void *) res, (void *) exp_res);
+      ret = 1;
+      return;
+    }
+
+  if (HP_TIMING_AVAIL)
+    {
+      hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0;
+      size_t i;
+
+      for (i = 0; i < 32; ++i)
+	{
+	  HP_TIMING_NOW (start);
+	  CALL (impl, s, acc);
+	  HP_TIMING_NOW (stop);
+	  HP_TIMING_BEST (best_time, start, stop);
+	}
+
+      printf ("\t%zd", (size_t) best_time);
+    }
+}
+
+static void
+do_test (size_t align, size_t pos, size_t len)
+{
+  size_t i;
+  char *acc, *s;
+
+  align &= 7;
+  if (align + pos >= page_size || len > 240 || ! len)
+    return;
+
+  acc = buf2 + (random () & 255);
+  s = buf1 + align;
+
+  for (i = 0; i < len; ++i)
+    {
+      acc[i] = random () & 255;
+      if (!acc[i])
+	acc[i] = random () & 255;
+      if (!acc[i])
+	acc[i] = 1 + (random () & 127);
+    }
+  acc[len] = '\0';
+
+  for (i = 0; i < pos; ++i)
+    s[i] = acc[random () % len];
+  s[pos] = random () & 255;
+  if (strchr (acc, s[pos]))
+    s[pos] = '\0';
+
+  if (HP_TIMING_AVAIL)
+    printf ("Length %4zd, alignment %2zd, acc len %2zd:", pos, align, len);
+
+  FOR_EACH_IMPL (impl, 0)
+    do_one_test (impl, s, acc, pos);
+
+  if (HP_TIMING_AVAIL)
+    putchar ('\n');
+}
+
+static void
+do_random_tests (void)
+{
+  size_t i, j, n, align, pos, len;
+  unsigned char *p = buf1 + page_size - 512;
+  unsigned char *acc;
+
+  for (n = 0; n < ITERATIONS; n++)
+    {
+      align = random () & 15;
+      if (random () & 1)
+	len = random () & 63;
+      else
+	len = random () & 15;
+      if (!len)
+	pos = 0;
+      else
+	pos = random () & 511;
+      if (pos + align >= 511)
+	pos = 510 - align - (random () & 7);
+      acc = buf2 + page_size - len - 1 - (random () & 7);
+      for (i = 0; i < len; ++i)
+	{
+	  acc[i] = random () & 255;
+	  if (!acc[i])
+	    acc[i] = random () & 255;
+	  if (!acc[i])
+	    acc[i] = 1 + (random () & 127);
+	}
+      acc[i] = '\0';
+      j = pos + align + 64;
+      if (j > 512)
+	j = 512;
+
+      for (i = 0; i < j; i++)
+	{
+	  if (i == pos + align)
+	    {
+	      if ((random () & 7) == 0)
+		p[i] = '\0';
+	      else
+		{
+		  p[i] = random () & 255;
+		  if (strchr (acc, p[i]))
+		    p[i] = '\0';
+		}
+	    }
+	  else if (i < align || i > pos + align)
+	    p[i] = random () & 255;
+	  else
+	    p[i] = acc [random () % len];
+	}
+
+      FOR_EACH_IMPL (impl, 1)
+	if (CALL (impl, p + align, acc) != pos)
+	  {
+	    error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %p, %zd) %zd != %zd",
+		   n, impl->name, align, acc, len,
+		   CALL (impl, p + align, acc), pos);
+	    ret = 1;
+	  }
+    }
+}
+
+int
+test_main (void)
+{
+  size_t i;
+
+  test_init ();
+
+  printf ("%32s", "");
+  FOR_EACH_IMPL (impl, 0)
+    printf ("\t%s", impl->name);
+  putchar ('\n');
+
+  for (i = 0; i < 32; ++i)
+    {
+      do_test (0, 512, i);
+      do_test (i, 512, i);
+    }
+
+  for (i = 1; i < 8; ++i)
+    {
+      do_test (0, 16 << i, 4);
+      do_test (i, 16 << i, 4);
+    }
+
+  for (i = 1; i < 8; ++i)
+    do_test (i, 64, 10);
+
+  for (i = 0; i < 64; ++i)
+    do_test (0, i, 6);
+
+  do_random_tests ();
+  return ret;
+}
+
+#include "../test-skeleton.c"