test: remove test suite

The test suite is now a developed in a separate git repository.
See here:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng-test.git

The test suite should be just like every other software compiled
with the cross-toolchain. In the past strange problems where found
when the test suite got build in the toolchain creation step.

16 files changed, 0 insertions, 2624 deletions

diff --git a/test/string/Makefile b/test/string/Makefile
deleted file mode 100644
index 8948a50e3..000000000
--- a/test/string/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# uClibc string tests
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-
-top_builddir=../../
-top_srcdir=../../
-include ../Rules.mak
--include Makefile.in
-include ../Test.mak
diff --git a/test/string/Makefile.in b/test/string/Makefile.in
deleted file mode 100644
index 39fb91210..000000000
--- a/test/string/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# uClibc string tests
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-
-EXTRA_CFLAGS := -fno-builtin
-
-ifeq ($(TARGET_ARCH),h8300)
-TESTS_DISABLED += stratcliff
-endif
diff --git a/test/string/bug-strcoll1.c b/test/string/bug-strcoll1.c
deleted file mode 100644
index b6510d926..000000000
--- a/test/string/bug-strcoll1.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <locale.h>
-
-int
-main (void)
-{
-  const char t1[] = "0-0-0-0-0-0-0-0-0-0.COM";
-  const char t2[] = "00000-00000.COM";
-  int res1;
-  int res2;
-
-  setlocale (LC_ALL, "en_US.ISO-8859-1");
-
-  res1 = strcoll (t1, t2);
-  printf ("strcoll (\"%s\", \"%s\") = %d\n", t1, t2, res1);
-  res2 = strcoll (t2, t1);
-  printf ("strcoll (\"%s\", \"%s\") = %d\n", t2, t1, res2);
-
-  return ((res1 == 0 && res2 != 0)
-	  || (res1 != 0 && res2 == 0)
-	  || (res1 < 0 && res2 < 0)
-	  || (res1 > 0 && res2 > 0));
-}
diff --git a/test/string/bug-strncat1.c b/test/string/bug-strncat1.c
deleted file mode 100644
index f1b5c37c5..000000000
--- a/test/string/bug-strncat1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Test case by Joseph S. Myers <jsm28@cam.ac.uk>.  */
-#undef __USE_STRING_INLINES
-#define __USE_STRING_INLINES
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char d[3] = "\0\1\2";
-
-int
-main (void)
-{
-  strncat (d, "\5\6", 1);
-  if (d[0] != '\5')
-    {
-      puts ("d[0] != '\\5'");
-      exit (1);
-    }
-  if (d[1] != '\0')
-    {
-      puts ("d[1] != '\\0'");
-      exit (1);
-    }
-  if (d[2] != '\2')
-    {
-      puts ("d[2] != '\\2'");
-      exit (1);
-    }
-
-  return 0;
-}
diff --git a/test/string/bug-strpbrk1.c b/test/string/bug-strpbrk1.c
deleted file mode 100644
index 28238b0f5..000000000
--- a/test/string/bug-strpbrk1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Test case by Joseph S. Myers <jsm28@cam.ac.uk>.  */
-#undef __USE_STRING_INLINES
-#define __USE_STRING_INLINES
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main (void)
-{
-  const char *a = "abc";
-  const char *b = a;
-
-  strpbrk (b++, "");
-  if (b != a + 1)
-    return 1;
-
-  return 0;
-}
diff --git a/test/string/bug-strspn1.c b/test/string/bug-strspn1.c
deleted file mode 100644
index a657bafc4..000000000
--- a/test/string/bug-strspn1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Test case by Joseph S. Myers <jsm28@cam.ac.uk>.  */
-#undef __USE_STRING_INLINES
-#define __USE_STRING_INLINES
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main (void)
-{
-  const char *a = "abc";
-  const char *b = a;
-
-  strspn (b++, "");
-  if (b != a + 1)
-    return 1;
-
-  return 0;
-}
diff --git a/test/string/stratcliff.c b/test/string/stratcliff.c
deleted file mode 100644
index b45be4bde..000000000
--- a/test/string/stratcliff.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* Test for string function add boundaries of usable memory.
-   Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define _GNU_SOURCE 1
-
-/* Make sure we don't test the optimized inline functions if we want to
-   test the real implementation.  */
-#undef __USE_STRING_INLINES
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-int
-main (int argc, char *argv[])
-{
-  int size = sysconf (_SC_PAGESIZE);
-  char *adr, *dest;
-  int result = 0;
-
-  adr = (char *) mmap (NULL, 3 * size, PROT_READ | PROT_WRITE,
-		       MAP_PRIVATE | MAP_ANON, -1, 0);
-  dest = (char *) mmap (NULL, 3 * size, PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_ANON, -1, 0);
-  if (adr == MAP_FAILED || dest == MAP_FAILED)
-    {
-      if (errno == ENOSYS)
-        puts ("No test, mmap not available.");
-      else
-        {
-          printf ("mmap failed: %s", strerror(errno));
-          result = 1;
-        }
-    }
-  else
-    {
-      int inner, middle, outer;
-
-      mprotect(adr, size, PROT_NONE);
-      mprotect(adr + 2 * size, size, PROT_NONE);
-      adr += size;
-
-      mprotect(dest, size, PROT_NONE);
-      mprotect(dest + 2 * size, size, PROT_NONE);
-      dest += size;
-
-      memset (adr, 'T', size);
-
-      /* strlen test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-          for (inner = MAX (outer, size - 64); inner < size; ++inner)
-	    {
-	      adr[inner] = '\0';
-
-	      if (strlen (&adr[outer]) != (size_t) (inner - outer))
-		{
-		  printf ("strlen flunked for outer = %d, inner = %d\n",
-			  outer, inner);
-		  result = 1;
-		}
-
-	      adr[inner] = 'T';
-	    }
-        }
-
-      /* strchr test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-	  for (middle = MAX (outer, size - 64); middle < size; ++middle)
-	    {
-	      for (inner = middle; inner < size; ++inner)
-		{
-		  char *cp;
-		  adr[middle] = 'V';
-		  adr[inner] = '\0';
-
-		  cp = strchr (&adr[outer], 'V');
-
-		  if ((inner == middle && cp != NULL)
-		      || (inner != middle
-			  && (cp - &adr[outer]) != middle - outer))
-		    {
-		      printf ("strchr flunked for outer = %d, middle = %d, "
-			      "inner = %d\n", outer, middle, inner);
-		      result = 1;
-		    }
-
-		  adr[inner] = 'T';
-		  adr[middle] = 'T';
-		}
-	    }
-        }
-
-      /* Special test.  */
-      adr[size - 1] = '\0';
-      if (strchr (&adr[size - 1], '\n') != NULL)
-	{
-	  puts ("strchr flunked for test of empty string at end of page");
-	  result = 1;
-	}
-
-      /* strrchr test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-	  for (middle = MAX (outer, size - 64); middle < size; ++middle)
-	    {
-	      for (inner = middle; inner < size; ++inner)
-		{
-		  char *cp;
-		  adr[middle] = 'V';
-		  adr[inner] = '\0';
-
-		  cp = strrchr (&adr[outer], 'V');
-
-		  if ((inner == middle && cp != NULL)
-		      || (inner != middle
-			  && (cp - &adr[outer]) != middle - outer))
-		    {
-		      printf ("strrchr flunked for outer = %d, middle = %d, "
-			      "inner = %d\n", outer, middle, inner);
-		      result = 1;
-		    }
-
-		  adr[inner] = 'T';
-		  adr[middle] = 'T';
-		}
-	    }
-        }
-
-      /* rawmemchr test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-	  for (middle = MAX (outer, size - 64); middle < size; ++middle)
-	    {
-	      char *cp;
-	      adr[middle] = 'V';
-
-	      cp = rawmemchr (&adr[outer], 'V');
-
-	      if (cp - &adr[outer] != middle - outer)
-		{
-		  printf ("rawmemchr flunked for outer = %d, middle = %d\n",
-			  outer, middle);
-		  result = 1;
-		}
-
-	      adr[middle] = 'T';
-	    }
-        }
-
-      /* strcpy test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-          for (inner = MAX (outer, size - 64); inner < size; ++inner)
-	    {
-	      adr[inner] = '\0';
-
-	      if (strcpy (dest, &adr[outer]) != dest
-		  || strlen (dest) != (size_t) (inner - outer))
-		{
-		  printf ("strcpy flunked for outer = %d, inner = %d\n",
-			  outer, inner);
-		  result = 1;
-		}
-
-	      adr[inner] = 'T';
-	    }
-        }
-
-      /* strncpy tests */
-      adr[size-1] = 'T';
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-	{
-	  size_t len;
-
-	  for (len = 0; len < size - outer; ++len)
-	    {
-	      if (strncpy (dest, &adr[outer], len) != dest
-		  || memcmp (dest, &adr[outer], len) != 0)
-		{
-		  printf ("outer strncpy flunked for outer = %d, len = %Zd\n",
-			  outer, len);
-		  result = 1;
-		}
-	    }
-        }
-      adr[size-1] = '\0';
-
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-          for (inner = MAX (outer, size - 64); inner < size; ++inner)
-	    {
-	      size_t len;
-
-	      adr[inner] = '\0';
-
-	      for (len = 0; len < size - outer + 64; ++len)
-		{
-		  if (strncpy (dest, &adr[outer], len) != dest
-		      || memcmp (dest, &adr[outer],
-				 MIN (inner - outer, len)) != 0
-		      || (inner - outer < len
-			  && strlen (dest) != (inner - outer)))
-		    {
-		      printf ("strncpy flunked for outer = %d, inner = %d, len = %Zd\n",
-			      outer, inner, len);
-		      result = 1;
-		    }
-		  if (strncpy (dest + 1, &adr[outer], len) != dest + 1
-		      || memcmp (dest + 1, &adr[outer],
-				 MIN (inner - outer, len)) != 0
-		      || (inner - outer < len
-			  && strlen (dest + 1) != (inner - outer)))
-		    {
-		      printf ("strncpy+1 flunked for outer = %d, inner = %d, len = %Zd\n",
-			      outer, inner, len);
-		      result = 1;
-		    }
-		}
-
-	      adr[inner] = 'T';
-	    }
-        }
-
-      /* stpcpy test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-          for (inner = MAX (outer, size - 64); inner < size; ++inner)
-	    {
-	      adr[inner] = '\0';
-
-	      if ((stpcpy (dest, &adr[outer]) - dest) != inner - outer)
-		{
-		  printf ("stpcpy flunked for outer = %d, inner = %d\n",
-			  outer, inner);
-		  result = 1;
-		}
-
-	      adr[inner] = 'T';
-	    }
-        }
-
-      /* stpncpy test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-        {
-          for (middle = MAX (outer, size - 64); middle < size; ++middle)
-	    {
-	      adr[middle] = '\0';
-
-	      for (inner = 0; inner < size - outer; ++ inner)
-		{
-		  if ((stpncpy (dest, &adr[outer], inner) - dest)
-		      != MIN (inner, middle - outer))
-		    {
-		      printf ("stpncpy flunked for outer = %d, middle = %d, "
-			      "inner = %d\n", outer, middle, inner);
-		      result = 1;
-		    }
-		}
-
-	      adr[middle] = 'T';
-	    }
-        }
-
-      /* memcpy test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-	for (inner = 0; inner < size - outer; ++inner)
-	  if (memcpy (dest, &adr[outer], inner) !=  dest)
-	    {
-	      printf ("memcpy flunked for outer = %d, inner = %d\n",
-		      outer, inner);
-	      result = 1;
-	    }
-
-      /* mempcpy test */
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-	for (inner = 0; inner < size - outer; ++inner)
-	  if (mempcpy (dest, &adr[outer], inner) !=  dest + inner)
-	    {
-	      printf ("mempcpy flunked for outer = %d, inner = %d\n",
-		      outer, inner);
-	      result = 1;
-	    }
-
-      /* memccpy test */
-      memset (adr, '\0', size);
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-	for (inner = 0; inner < size - outer; ++inner)
-	  if (memccpy (dest, &adr[outer], '\1', inner) != NULL)
-	    {
-	      printf ("memccpy flunked full copy for outer = %d, inner = %d\n",
-		      outer, inner);
-	      result = 1;
-	    }
-      for (outer = size - 1; outer >= MAX (0, size - 128); --outer)
-	for (middle = 0; middle < size - outer; ++middle)
-	  {
-	    memset (dest, '\2', middle + 1);
-	    for (inner = 0; inner < middle; ++inner)
-	      {
-		adr[outer + inner] = '\1';
-
-		if (memccpy (dest, &adr[outer], '\1', middle + 128)
-		    !=  dest + inner + 1)
-		  {
-		    printf ("\
-memccpy flunked partial copy for outer = %d, middle = %d, inner = %d\n",
-			    outer, middle, inner);
-		    result = 1;
-		  }
-		else if (dest[inner + 1] != '\2')
-		  {
-		    printf ("\
-memccpy copied too much for outer = %d, middle = %d, inner = %d\n",
-			    outer, middle, inner);
-		    result = 1;
-		  }
-		adr[outer + inner] = '\0';
-	      }
-	  }
-    }
-
-  return result;
-}
diff --git a/test/string/test-ffs.c b/test/string/test-ffs.c
deleted file mode 100644
index e43f12360..000000000
--- a/test/string/test-ffs.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 1994, 1997, 2000, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
-     On-Line Applications Research Corporation.
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-main (void)
-{
-  int failures = 0;
-  int i;
-
-  auto void try (const char *name, long long int param, int value,
-		 int expected);
-
-  void try (const char *name, long long int param, int value, int expected)
-    {
-      if (value != expected)
-	{
-	  printf ("%s(%#llx) expected %d got %d\n",
-		  name, param, expected, value);
-	  ++failures;
-	}
-      else
-	printf ("%s(%#llx) as expected %d\n", name, param, value);
-    }
-
-#define TEST(fct, type) \
-  try (#fct, 0, fct ((type) 0), 0);					      \
-  for (i=0 ; i < 8 * sizeof (type); i++)				      \
-    try (#fct, 1ll << i, fct (((type) 1) << i), i + 1);			      \
-  for (i=0 ; i < 8 * sizeof (type) ; i++)				      \
-    try (#fct, (~((type) 0) >> i) << i, fct ((~((type) 0) >> i) << i), i + 1);\
-  try (#fct, 0x80008000, fct ((type) 0x80008000), 16)
-
-  TEST (ffs, int);
-/* Not implemented in uClibc (yet?)
-  TEST (ffsl, long int);
-  TEST (ffsll, long long int);
-*/
-
-  if (failures)
-    printf ("Test FAILED!  %d failure%s.\n", failures, &"s"[failures == 1]);
-  else
-    puts ("Test succeeded.");
-
-  return failures;
-}
diff --git a/test/string/testcopy.c b/test/string/testcopy.c
deleted file mode 100644
index 51c47a174..000000000
--- a/test/string/testcopy.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright (C) 1990, 1991, 1992, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Torbjorn Granlund (tege@sics.se).
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <malloc.h>
-
-int
-main (void)
-{
-  char *mem, *memp;
-  char *rand_mem;
-  char *lo_around, *hi_around;
-  int size, max_size;
-  int src_off, dst_off;
-  int i;
-  int space_around = 10;
-
-  max_size = 256;
-
-  mem = malloc (max_size + 2 * max_size + 2 * space_around);
-  rand_mem = malloc (max_size);
-  lo_around = malloc (space_around);
-  hi_around = malloc (space_around);
-  memp = mem + space_around;
-
-  /* Fill RAND_MEM with random bytes, each non-zero.  */
-  for (i = 0; i < max_size; i++)
-    {
-      int x;
-      do
-	x = random ();
-      while (x == 0);
-      rand_mem[i] = x;
-    }
-
-  for (size = 0; size < max_size; size++)
-    {
-      printf("phase %d\n", size);
-      for (src_off = 0; src_off <= 16; src_off++)
-	{
-	  for (dst_off = 0; dst_off <= 16; dst_off++)
-	    {
-	      /* Put zero around the intended destination, to check
-		 that it's not clobbered.  */
-	      for (i = 1; i < space_around; i++)
-		{
-		  memp[dst_off - i] = 0;
-		  memp[dst_off + size - 1 + i] = 0;
-		}
-
-	      /* Fill the source area with known contents.  */
-	      for (i = 0; i < size; i++)
-		memp[src_off + i] = rand_mem[i];
-
-	      /* Remember the contents around the destination area.
-		 (It might not be what we wrote some lines above, since
-		 the src area and the dst area overlap.)  */
-	      for (i = 1; i < space_around; i++)
-		{
-		  lo_around[i] = memp[dst_off - i];
-		  hi_around[i] = memp[dst_off + size - 1 + i];
-		}
-
-	      memmove (memp + dst_off, memp + src_off, size);
-
-	      /* Check that the destination area has the same
-		 contents we wrote to the source area.  */
-	      for (i = 0; i < size; i++)
-		{
-		  if (memp[dst_off + i] != rand_mem[i])
-		    abort ();
-		}
-
-	      /* Check that the area around the destination is not
-		 clobbered.  */
-	      for (i = 1; i < space_around; i++)
-		{
-		  if (memp[dst_off - i] != lo_around[i])
-		    abort ();
-		  if (memp[dst_off + size - 1 + i] != hi_around[i])
-		    abort ();
-		}
-	    }
-	}
-    }
-
-  puts ("Test succeeded.");
-
-  return 0;
-}
diff --git a/test/string/tester.c b/test/string/tester.c
deleted file mode 100644
index 7f3ff2865..000000000
--- a/test/string/tester.c
+++ /dev/null
@@ -1,1646 +0,0 @@
-/* Tester for string functions.
-   Copyright (C) 1995-2001, 2003, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-/* Make sure we don't test the optimized inline functions if we want to
-   test the real implementation.  */
-#if !defined DO_STRING_INLINES
-#undef __USE_STRING_INLINES
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <fcntl.h>
-
-#ifdef __UCLIBC__
-# define __TEST_BSD_FUNCS__
-#else
-# undef __TEST_BSD_FUNCS__
-#endif
-
-#if defined(__UCLIBC_SUSV3_LEGACY__) || defined(__UCLIBC_SUSV3_LEGACY_MACROS__)
-# define __TEST_SUSV3_LEGACY__
-#else
-# undef __TEST_SUSV3_LEGACY__
-#endif
-
-#define	STREQ(a, b)	(strcmp((a), (b)) == 0)
-
-const char *it = "<UNSET>";	/* Routine name for message routines. */
-size_t errors = 0;
-
-/* Complain if condition is not true.  */
-static void
-check (int thing, int number)
-{
-  if (!thing)
-    {
-      printf("%s flunked test %d\n", it, number);
-      ++errors;
-    }
-}
-
-/* Complain if first two args don't strcmp as equal.  */
-static void
-equal (const char *a, const char *b, int number)
-{
-  check(a != NULL && b != NULL && STREQ (a, b), number);
-}
-
-char one[50];
-char two[50];
-char *cp;
-
-static void
-test_strcmp (void)
-{
-  it = "strcmp";
-  check (strcmp ("", "") == 0, 1);		/* Trivial case. */
-  check (strcmp ("a", "a") == 0, 2);		/* Identity. */
-  check (strcmp ("abc", "abc") == 0, 3);	/* Multicharacter. */
-  check (strcmp ("abc", "abcd") < 0, 4);	/* Length mismatches. */
-  check (strcmp ("abcd", "abc") > 0, 5);
-  check (strcmp ("abcd", "abce") < 0, 6);	/* Honest miscompares. */
-  check (strcmp ("abce", "abcd") > 0, 7);
-  check (strcmp ("a\203", "a") > 0, 8);		/* Tricky if char signed. */
-  check (strcmp ("a\203", "a\003") > 0, 9);
-
-  {
-    char buf1[0x40], buf2[0x40];
-    int i, j;
-    for (i=0; i < 0x10; i++)
-      for (j = 0; j < 0x10; j++)
-	{
-	  int k;
-	  for (k = 0; k < 0x3f; k++)
-	    {
-	      buf1[k] = '0' ^ (k & 4);
-	      buf2[k] = '4' ^ (k & 4);
-	    }
-	  buf1[i] = buf1[0x3f] = 0;
-	  buf2[j] = buf2[0x3f] = 0;
-	  for (k = 0; k < 0xf; k++)
-	    {
-	      int cnum = 0x10+0x10*k+0x100*j+0x1000*i;
-	      check (strcmp (buf1+i,buf2+j) == 0, cnum);
-	      buf1[i+k] = 'A' + i + k;
-	      buf1[i+k+1] = 0;
-	      check (strcmp (buf1+i,buf2+j) > 0, cnum+1);
-	      check (strcmp (buf2+j,buf1+i) < 0, cnum+2);
-	      buf2[j+k] = 'B' + i + k;
-	      buf2[j+k+1] = 0;
-	      check (strcmp (buf1+i,buf2+j) < 0, cnum+3);
-	      check (strcmp (buf2+j,buf1+i) > 0, cnum+4);
-	      buf2[j+k] = 'A' + i + k;
-	      buf1[i] = 'A' + i + 0x80;
-	      check (strcmp (buf1+i,buf2+j) > 0, cnum+5);
-	      check (strcmp (buf2+j,buf1+i) < 0, cnum+6);
-	      buf1[i] = 'A' + i;
-	    }
-	}
-  }
-}
-
-#define SIMPLE_COPY(fn, n, str, ntest) \
-  do {									      \
-    int __n;								      \
-    char *cp;								      \
-    for (__n = 0; __n < (int) sizeof (one); ++__n)			      \
-      one[__n] = 'Z';							      \
-    fn (one, str);							      \
-    for (cp = one, __n = 0; __n < n; ++__n, ++cp)			      \
-      check (*cp == '0' + (n % 10), ntest);				      \
-    check (*cp == '\0', ntest);						      \
-  } while (0)
-
-static void
-test_strcpy (void)
-{
-  int i;
-  it = "strcpy";
-  check (strcpy (one, "abcd") == one, 1); /* Returned value. */
-  equal (one, "abcd", 2);		/* Basic test. */
-
-  (void) strcpy (one, "x");
-  equal (one, "x", 3);			/* Writeover. */
-  equal (one+2, "cd", 4);		/* Wrote too much? */
-
-  (void) strcpy (two, "hi there");
-  (void) strcpy (one, two);
-  equal (one, "hi there", 5);		/* Basic test encore. */
-  equal (two, "hi there", 6);		/* Stomped on source? */
-
-  (void) strcpy (one, "");
-  equal (one, "", 7);			/* Boundary condition. */
-
-  for (i = 0; i < 16; i++)
-    {
-      (void) strcpy (one + i, "hi there");	/* Unaligned destination. */
-      equal (one + i, "hi there", 8 + (i * 2));
-      (void) strcpy (two, one + i);		/* Unaligned source. */
-      equal (two, "hi there", 9 + (i * 2));
-    }
-
-  SIMPLE_COPY(strcpy, 0, "", 41);
-  SIMPLE_COPY(strcpy, 1, "1", 42);
-  SIMPLE_COPY(strcpy, 2, "22", 43);
-  SIMPLE_COPY(strcpy, 3, "333", 44);
-  SIMPLE_COPY(strcpy, 4, "4444", 45);
-  SIMPLE_COPY(strcpy, 5, "55555", 46);
-  SIMPLE_COPY(strcpy, 6, "666666", 47);
-  SIMPLE_COPY(strcpy, 7, "7777777", 48);
-  SIMPLE_COPY(strcpy, 8, "88888888", 49);
-  SIMPLE_COPY(strcpy, 9, "999999999", 50);
-  SIMPLE_COPY(strcpy, 10, "0000000000", 51);
-  SIMPLE_COPY(strcpy, 11, "11111111111", 52);
-  SIMPLE_COPY(strcpy, 12, "222222222222", 53);
-  SIMPLE_COPY(strcpy, 13, "3333333333333", 54);
-  SIMPLE_COPY(strcpy, 14, "44444444444444", 55);
-  SIMPLE_COPY(strcpy, 15, "555555555555555", 56);
-  SIMPLE_COPY(strcpy, 16, "6666666666666666", 57);
-
-  /* Simple test using implicitly coerced `void *' arguments.  */
-  const void *src = "frobozz";
-  void *dst = one;
-  check (strcpy (dst, src) == dst, 1);
-  equal (dst, "frobozz", 2);
-}
-
-static void
-test_stpcpy (void)
-{
-  it = "stpcpy";
-  check ((stpcpy (one, "a") - one) == 1, 1);
-  equal (one, "a", 2);
-
-  check ((stpcpy (one, "ab") - one) == 2, 3);
-  equal (one, "ab", 4);
-
-  check ((stpcpy (one, "abc") - one) == 3, 5);
-  equal (one, "abc", 6);
-
-  check ((stpcpy (one, "abcd") - one) == 4, 7);
-  equal (one, "abcd", 8);
-
-  check ((stpcpy (one, "abcde") - one) == 5, 9);
-  equal (one, "abcde", 10);
-
-  check ((stpcpy (one, "abcdef") - one) == 6, 11);
-  equal (one, "abcdef", 12);
-
-  check ((stpcpy (one, "abcdefg") - one) == 7, 13);
-  equal (one, "abcdefg", 14);
-
-  check ((stpcpy (one, "abcdefgh") - one) == 8, 15);
-  equal (one, "abcdefgh", 16);
-
-  check ((stpcpy (one, "abcdefghi") - one) == 9, 17);
-  equal (one, "abcdefghi", 18);
-
-  check ((stpcpy (one, "x") - one) == 1, 19);
-  equal (one, "x", 20);			/* Writeover. */
-  equal (one+2, "cdefghi", 21);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xx") - one) == 2, 22);
-  equal (one, "xx", 23);		/* Writeover. */
-  equal (one+3, "defghi", 24);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xxx") - one) == 3, 25);
-  equal (one, "xxx", 26);		/* Writeover. */
-  equal (one+4, "efghi", 27);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xxxx") - one) == 4, 28);
-  equal (one, "xxxx", 29);		/* Writeover. */
-  equal (one+5, "fghi", 30);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xxxxx") - one) == 5, 31);
-  equal (one, "xxxxx", 32);		/* Writeover. */
-  equal (one+6, "ghi", 33);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xxxxxx") - one) == 6, 34);
-  equal (one, "xxxxxx", 35);		/* Writeover. */
-  equal (one+7, "hi", 36);		/* Wrote too much? */
-
-  check ((stpcpy (one, "xxxxxxx") - one) == 7, 37);
-  equal (one, "xxxxxxx", 38);		/* Writeover. */
-  equal (one+8, "i", 39);		/* Wrote too much? */
-
-  check ((stpcpy (stpcpy (stpcpy (one, "a"), "b"), "c") - one) == 3, 40);
-  equal (one, "abc", 41);
-  equal (one + 4, "xxx", 42);
-
-  SIMPLE_COPY(stpcpy, 0, "", 43);
-  SIMPLE_COPY(stpcpy, 1, "1", 44);
-  SIMPLE_COPY(stpcpy, 2, "22", 45);
-  SIMPLE_COPY(stpcpy, 3, "333", 46);
-  SIMPLE_COPY(stpcpy, 4, "4444", 47);
-  SIMPLE_COPY(stpcpy, 5, "55555", 48);
-  SIMPLE_COPY(stpcpy, 6, "666666", 49);
-  SIMPLE_COPY(stpcpy, 7, "7777777", 50);
-  SIMPLE_COPY(stpcpy, 8, "88888888", 51);
-  SIMPLE_COPY(stpcpy, 9, "999999999", 52);
-  SIMPLE_COPY(stpcpy, 10, "0000000000", 53);
-  SIMPLE_COPY(stpcpy, 11, "11111111111", 54);
-  SIMPLE_COPY(stpcpy, 12, "222222222222", 55);
-  SIMPLE_COPY(stpcpy, 13, "3333333333333", 56);
-  SIMPLE_COPY(stpcpy, 14, "44444444444444", 57);
-  SIMPLE_COPY(stpcpy, 15, "555555555555555", 58);
-  SIMPLE_COPY(stpcpy, 16, "6666666666666666", 59);
-}
-
-static void
-test_stpncpy (void)
-{
-  it = "stpncpy";
-  memset (one, 'x', sizeof (one));
-  check (stpncpy (one, "abc", 2) == one + 2, 1);
-  check (stpncpy (one, "abc", 3) == one + 3, 2);
-  check (stpncpy (one, "abc", 4) == one + 3, 3);
-  check (one[3] == '\0' && one[4] == 'x', 4);
-  check (stpncpy (one, "abcd", 5) == one + 4, 5);
-  check (one[4] == '\0' && one[5] == 'x', 6);
-  check (stpncpy (one, "abcd", 6) == one + 4, 7);
-  check (one[4] == '\0' && one[5] == '\0' && one[6] == 'x', 8);
-}
-
-static void
-test_strcat (void)
-{
-  it = "strcat";
-  (void) strcpy (one, "ijk");
-  check (strcat (one, "lmn") == one, 1); /* Returned value. */
-  equal (one, "ijklmn", 2);		/* Basic test. */
-
-  (void) strcpy (one, "x");
-  (void) strcat (one, "yz");
-  equal (one, "xyz", 3);			/* Writeover. */
-  equal (one+4, "mn", 4);			/* Wrote too much? */
-
-  (void) strcpy (one, "gh");
-  (void) strcpy (two, "ef");
-  (void) strcat (one, two);
-  equal (one, "ghef", 5);			/* Basic test encore. */
-  equal (two, "ef", 6);			/* Stomped on source? */
-
-  (void) strcpy (one, "");
-  (void) strcat (one, "");
-  equal (one, "", 7);			/* Boundary conditions. */
-  (void) strcpy (one, "ab");
-  (void) strcat (one, "");
-  equal (one, "ab", 8);
-  (void) strcpy (one, "");
-  (void) strcat (one, "cd");
-  equal (one, "cd", 9);
-}
-
-static void
-test_strncat (void)
-{
-  /* First test it as strcat, with big counts, then test the count
-     mechanism.  */
-  it = "strncat";
-  (void) strcpy (one, "ijk");
-  check (strncat (one, "lmn", 99) == one, 1);	/* Returned value. */
-  equal (one, "ijklmn", 2);		/* Basic test. */
-
-  (void) strcpy (one, "x");
-  (void) strncat (one, "yz", 99);
-  equal (one, "xyz", 3);		/* Writeover. */
-  equal (one+4, "mn", 4);		/* Wrote too much? */
-
-  (void) strcpy (one, "gh");
-  (void) strcpy (two, "ef");
-  (void) strncat (one, two, 99);
-  equal (one, "ghef", 5);			/* Basic test encore. */
-  equal (two, "ef", 6);			/* Stomped on source? */
-
-  (void) strcpy (one, "");
-  (void) strncat (one, "", 99);
-  equal (one, "", 7);			/* Boundary conditions. */
-  (void) strcpy (one, "ab");
-  (void) strncat (one, "", 99);
-  equal (one, "ab", 8);
-  (void) strcpy (one, "");
-  (void) strncat (one, "cd", 99);
-  equal (one, "cd", 9);
-
-  (void) strcpy (one, "ab");
-  (void) strncat (one, "cdef", 2);
-  equal (one, "abcd", 10);			/* Count-limited. */
-
-  (void) strncat (one, "gh", 0);
-  equal (one, "abcd", 11);			/* Zero count. */
-
-  (void) strncat (one, "gh", 2);
-  equal (one, "abcdgh", 12);		/* Count and length equal. */
-
-  (void) strncat (one, "ij", (size_t)-1);	/* set sign bit in count */
-  equal (one, "abcdghij", 13);
-}
-
-static void
-test_strlcat (void)
-{
-#ifdef __TEST_BSD_FUNCS__
-  /* First test it as strcat, with big counts, then test the count
-     mechanism.  */
-  it = "strlcat";
-  (void) strcpy (one, "ijk");
-  check (strlcat (one, "lmn", 99) == 6, 1);	/* Returned value. */
-  equal (one, "ijklmn", 2);		/* Basic test. */
-
-  (void) strcpy (one, "x");
-  (void) strlcat (one, "yz", 99);
-  equal (one, "xyz", 3);		/* Writeover. */
-  equal (one+4, "mn", 4);		/* Wrote too much? */
-
-  (void) strcpy (one, "gh");
-  (void) strcpy (two, "ef");
-  (void) strlcat (one, two, 99);
-  equal (one, "ghef", 5);			/* Basic test encore. */
-  equal (two, "ef", 6);			/* Stomped on source? */
-
-  (void) strcpy (one, "");
-  (void) strlcat (one, "", 99);
-  equal (one, "", 7);			/* Boundary conditions. */
-  (void) strcpy (one, "ab");
-  (void) strlcat (one, "", 99);
-  equal (one, "ab", 8);
-  (void) strcpy (one, "");
-  (void) strlcat (one, "cd", 99);
-  equal (one, "cd", 9);
-
-  (void) strcpy (one, "ab");
-  (void) strlcat (one, "cdef", 2);
-  equal (one, "ab", 10);			/* Count-limited. */
-
-  (void) strlcat (one, "gh", 0);
-  equal (one, "ab", 11);			/* Zero count. */
-
-  (void) strlcat (one, "gh", 4);
-  equal (one, "abg", 12);		/* Count and length equal. */
-
-  (void) strlcat (one, "ij", (size_t)-1);	/* set sign bit in count */
-  equal (one, "abgij", 13);
-#endif
-}
-
-static void
-test_strncmp (void)
-{
-  /* First test as strcmp with big counts, then test count code.  */
-  it = "strncmp";
-  check (strncmp ("", "", 99) == 0, 1);	/* Trivial case. */
-  check (strncmp ("a", "a", 99) == 0, 2);	/* Identity. */
-  check (strncmp ("abc", "abc", 99) == 0, 3);	/* Multicharacter. */
-  check (strncmp ("abc", "abcd", 99) < 0, 4);	/* Length unequal. */
-  check (strncmp ("abcd", "abc", 99) > 0, 5);
-  check (strncmp ("abcd", "abce", 99) < 0, 6);	/* Honestly unequal. */
-  check (strncmp ("abce", "abcd", 99) > 0, 7);
-  check (strncmp ("a\203", "a", 2) > 0, 8);	/* Tricky if '\203' < 0 */
-  check (strncmp ("a\203", "a\003", 2) > 0, 9);
-  check (strncmp ("abce", "abcd", 3) == 0, 10);	/* Count limited. */
-  check (strncmp ("abce", "abc", 3) == 0, 11);	/* Count == length. */
-  check (strncmp ("abcd", "abce", 4) < 0, 12);	/* Nudging limit. */
-  check (strncmp ("abc", "def", 0) == 0, 13);	/* Zero count. */
-  check (strncmp ("abc", "", (size_t)-1) > 0, 14);	/* set sign bit in count */
-  check (strncmp ("abc", "abc", (size_t)-2) == 0, 15);
-  check (strncmp ("aa", "ab", (size_t)-1) < 0, 16);
-}
-
-static void
-test_strncpy (void)
-{
-  /* Testing is a bit different because of odd semantics.  */
-  it = "strncpy";
-  check (strncpy (one, "abc", 4) == one, 1);	/* Returned value. */
-  equal (one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strncpy (one, "xyz", 2);
-  equal (one, "xycdefgh", 3);			/* Copy cut by count. */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strncpy (one, "xyz", 3);		/* Copy cut just before NUL. */
-  equal (one, "xyzdefgh", 4);
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strncpy (one, "xyz", 4);		/* Copy just includes NUL. */
-  equal (one, "xyz", 5);
-  equal (one+4, "efgh", 6);			/* Wrote too much? */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strncpy (one, "xyz", 5);		/* Copy includes padding. */
-  equal (one, "xyz", 7);
-  equal (one+4, "", 8);
-  equal (one+5, "fgh", 9);
-
-  (void) strcpy (one, "abc");
-  (void) strncpy (one, "xyz", 0);		/* Zero-length copy. */
-  equal (one, "abc", 10);
-
-  (void) strncpy (one, "", 2);		/* Zero-length source. */
-  equal (one, "", 11);
-  equal (one+1, "", 12);
-  equal (one+2, "c", 13);
-
-  (void) strcpy (one, "hi there");
-  (void) strncpy (two, one, 9);
-  equal (two, "hi there", 14);		/* Just paranoia. */
-  equal (one, "hi there", 15);		/* Stomped on source? */
-}
-
-static void
-test_strlcpy (void)
-{
-#ifdef __TEST_BSD_FUNCS__
-  /* Testing is a bit different because of odd semantics.  */
-  it = "strlcpy";
-  check (strlcpy (one, "abc", sizeof(one)) == 3, 1);	/* Returned value. */
-  equal (one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strlcpy (one, "xyz", 2);
-  equal (one, "x\0cdefgh", 3);			/* Copy cut by count. */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strlcpy (one, "xyz", 3);		/* Copy cut just before NUL. */
-  equal (one, "xy\0defgh", 4);
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strlcpy (one, "xyz", 4);		/* Copy just includes NUL. */
-  equal (one, "xyz", 5);
-  equal (one+4, "efgh", 6);			/* Wrote too much? */
-
-  (void) strcpy (one, "abcdefgh");
-  (void) strlcpy (one, "xyz", 5);		/* Copy includes padding. */
-  equal (one, "xyz", 7);
-  equal (one+3, "", 8);
-  equal (one+4, "efgh", 9);
-
-  (void) strcpy (one, "abc");
-  (void) strlcpy (one, "xyz", 0);		/* Zero-length copy. */
-  equal (one, "abc", 10);
-
-  (void) strlcpy (one, "", 2);		/* Zero-length source. */
-  equal (one, "", 11);
-  equal (one+1, "bc", 12);
-  equal (one+2, "c", 13);
-
-  (void) strcpy (one, "hi there");
-  (void) strlcpy (two, one, 9);
-  equal (two, "hi there", 14);		/* Just paranoia. */
-  equal (one, "hi there", 15);		/* Stomped on source? */
-#endif
-}
-
-static void
-test_strlen (void)
-{
-  it = "strlen";
-  check (strlen ("") == 0, 1);		/* Empty. */
-  check (strlen ("a") == 1, 2);		/* Single char. */
-  check (strlen ("abcd") == 4, 3);	/* Multiple chars. */
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int)(buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	check (strlen (p) == 2, 4+i);
-      }
-   }
-}
-
-static void
-test_strnlen (void)
-{
-  it = "strnlen";
-  check (strnlen ("", 10) == 0, 1);		/* Empty. */
-  check (strnlen ("a", 10) == 1, 2);		/* Single char. */
-  check (strnlen ("abcd", 10) == 4, 3);		/* Multiple chars. */
-  check (strnlen ("foo", (size_t)-1) == 3, 4);	/* limits of n. */
-
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int)(buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	check (strnlen (p, 100) == 2, 5+i);
-      }
-   }
-}
-
-static void
-test_strchr (void)
-{
-  it = "strchr";
-  check (strchr ("abcd", 'z') == NULL, 1);	/* Not found. */
-  (void) strcpy (one, "abcd");
-  check (strchr (one, 'c') == one+2, 2);	/* Basic test. */
-  check (strchr (one, 'd') == one+3, 3);	/* End of string. */
-  check (strchr (one, 'a') == one, 4);		/* Beginning. */
-  check (strchr (one, '\0') == one+4, 5);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (strchr (one, 'b') == one+1, 6);	/* Finding first. */
-  (void) strcpy (one, "");
-  check (strchr (one, 'b') == NULL, 7);		/* Empty string. */
-  check (strchr (one, '\0') == one, 8);		/* NUL in empty string. */
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	check (strchr (p, '/') == NULL, 9+i);
-      }
-   }
-}
-
-static void
-test_strchrnul (void)
-{
-  const char *os;
-  it = "strchrnul";
-  cp = strchrnul ((os = "abcd"), 'z');
-  check (*cp == '\0', 1);			/* Not found. */
-  check (cp == os + 4, 2);
-  (void) strcpy (one, "abcd");
-  check (strchrnul (one, 'c') == one+2, 3);	/* Basic test. */
-  check (strchrnul (one, 'd') == one+3, 4);	/* End of string. */
-  check (strchrnul (one, 'a') == one, 5);	/* Beginning. */
-  check (strchrnul (one, '\0') == one+4, 6);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (strchrnul (one, 'b') == one+1, 7);	/* Finding first. */
-  (void) strcpy (one, "");
-  check (strchrnul (one, 'b') == one, 8);	/* Empty string. */
-  check (strchrnul (one, '\0') == one, 9);	/* NUL in empty string. */
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	cp = strchrnul (p, '/');
-	check (*cp == '\0', 9+2*i);
-	check (cp == p+2, 10+2*i);
-      }
-   }
-}
-
-static void
-test_rawmemchr (void)
-{
-  it = "rawmemchr";
-  (void) strcpy (one, "abcd");
-  check (rawmemchr (one, 'c') == one+2, 1);	/* Basic test. */
-  check (rawmemchr (one, 'd') == one+3, 2);	/* End of string. */
-  check (rawmemchr (one, 'a') == one, 3);		/* Beginning. */
-  check (rawmemchr (one, '\0') == one+4, 4);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (rawmemchr (one, 'b') == one+1, 5);	/* Finding first. */
-  (void) strcpy (one, "");
-  check (rawmemchr (one, '\0') == one, 6);	/* NUL in empty string. */
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	check (rawmemchr (p, 'R') == p+8, 6+i);
-      }
-   }
-}
-
-static void
-test_index (void)
-{
-#ifdef __TEST_SUSV3_LEGACY__
-  it = "index";
-  check (index ("abcd", 'z') == NULL, 1);	/* Not found. */
-  (void) strcpy (one, "abcd");
-  check (index (one, 'c') == one+2, 2);	/* Basic test. */
-  check (index (one, 'd') == one+3, 3);	/* End of string. */
-  check (index (one, 'a') == one, 4);	/* Beginning. */
-  check (index (one, '\0') == one+4, 5);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (index (one, 'b') == one+1, 6);	/* Finding first. */
-  (void) strcpy (one, "");
-  check (index (one, 'b') == NULL, 7);	/* Empty string. */
-  check (index (one, '\0') == one, 8);	/* NUL in empty string. */
-#endif
-}
-
-static void
-test_strrchr (void)
-{
-  it = "strrchr";
-  check (strrchr ("abcd", 'z') == NULL, 1);	/* Not found. */
-  (void) strcpy (one, "abcd");
-  check (strrchr (one, 'c') == one+2, 2);	/* Basic test. */
-  check (strrchr (one, 'd') == one+3, 3);	/* End of string. */
-  check (strrchr (one, 'a') == one, 4);		/* Beginning. */
-  check (strrchr (one, '\0') == one+4, 5);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (strrchr (one, 'b') == one+3, 6);	/* Finding last. */
-  (void) strcpy (one, "");
-  check (strrchr (one, 'b') == NULL, 7);	/* Empty string. */
-  check (strrchr (one, '\0') == one, 8);	/* NUL in empty string. */
-  {
-    char buf[4096];
-    int i;
-    char *p;
-    for (i=0; i < 0x100; i++)
-      {
-	p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
-	strcpy (p, "OK");
-	strcpy (p+3, "BAD/WRONG");
-	check (strrchr (p, '/') == NULL, 9+i);
-      }
-   }
-}
-
-static void
-test_memrchr (void)
-{
-  size_t l;
-  it = "memrchr";
-  check (memrchr ("abcd", 'z', 5) == NULL, 1);	/* Not found. */
-  (void) strcpy (one, "abcd");
-  l = strlen (one) + 1;
-  check (memrchr (one, 'c', l) == one+2, 2);	/* Basic test. */
-  check (memrchr (one, 'd', l) == one+3, 3);	/* End of string. */
-  check (memrchr (one, 'a', l) == one, 4);		/* Beginning. */
-  check (memrchr (one, '\0', l) == one+4, 5);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  l = strlen (one) + 1;
-  check (memrchr (one, 'b', l) == one+3, 6);	/* Finding last. */
-  (void) strcpy (one, "");
-  l = strlen (one) + 1;
-  check (memrchr (one, 'b', l) == NULL, 7);	/* Empty string. */
-  check (memrchr (one, '\0', l) == one, 8);	/* NUL in empty string. */
-
-  /* now test all possible alignment and length combinations to catch
-     bugs due to unrolled loops (assuming unrolling is limited to no
-     more than 128 byte chunks: */
-  {
-    char buf[128 + sizeof(long)];
-    long align, len, i, pos;
-
-    for (align = 0; align < (long) sizeof(long); ++align) {
-      for (len = 0; len < (long) (sizeof(buf) - align); ++len) {
-	for (i = 0; i < len; ++i)
-	  buf[align + i] = 'x';		/* don't depend on memset... */
-
-	for (pos = len - 1; pos >= 0; --pos) {
-#if 0
-	  printf("align %d, len %d, pos %d\n", align, len, pos);
-#endif
-	  check(memrchr(buf + align, 'x', len) == buf + align + pos, 9);
-	  check(memrchr(buf + align + pos + 1, 'x', len - (pos + 1)) == NULL,
-		10);
-	  buf[align + pos] = '-';
-	}
-      }
-    }
-  }
-}
-
-static void
-test_rindex (void)
-{
-#ifdef __TEST_SUSV3_LEGACY__
-  it = "rindex";
-  check (rindex ("abcd", 'z') == NULL, 1);	/* Not found. */
-  (void) strcpy (one, "abcd");
-  check (rindex (one, 'c') == one+2, 2);	/* Basic test. */
-  check (rindex (one, 'd') == one+3, 3);	/* End of string. */
-  check (rindex (one, 'a') == one, 4);	/* Beginning. */
-  check (rindex (one, '\0') == one+4, 5);	/* Finding NUL. */
-  (void) strcpy (one, "ababa");
-  check (rindex (one, 'b') == one+3, 6);	/* Finding last. */
-  (void) strcpy (one, "");
-  check (rindex (one, 'b') == NULL, 7);	/* Empty string. */
-  check (rindex (one, '\0') == one, 8);	/* NUL in empty string. */
-#endif
-}
-
-static void
-test_strpbrk (void)
-{
-  it = "strpbrk";
-  check(strpbrk("abcd", "z") == NULL, 1);	/* Not found. */
-  (void) strcpy(one, "abcd");
-  check(strpbrk(one, "c") == one+2, 2);	/* Basic test. */
-  check(strpbrk(one, "d") == one+3, 3);	/* End of string. */
-  check(strpbrk(one, "a") == one, 4);	/* Beginning. */
-  check(strpbrk(one, "") == NULL, 5);	/* Empty search list. */
-  check(strpbrk(one, "cb") == one+1, 6);	/* Multiple search. */
-  (void) strcpy(one, "abcabdea");
-  check(strpbrk(one, "b") == one+1, 7);	/* Finding first. */
-  check(strpbrk(one, "cb") == one+1, 8);	/* With multiple search. */
-  check(strpbrk(one, "db") == one+1, 9);	/* Another variant. */
-  (void) strcpy(one, "");
-  check(strpbrk(one, "bc") == NULL, 10);	/* Empty string. */
-  (void) strcpy(one, "");
-  check(strpbrk(one, "bcd") == NULL, 11);	/* Empty string. */
-  (void) strcpy(one, "");
-  check(strpbrk(one, "bcde") == NULL, 12);	/* Empty string. */
-  check(strpbrk(one, "") == NULL, 13);	/* Both strings empty. */
-  (void) strcpy(one, "abcabdea");
-  check(strpbrk(one, "befg") == one+1, 14);	/* Finding first. */
-  check(strpbrk(one, "cbr") == one+1, 15);	/* With multiple search. */
-  check(strpbrk(one, "db") == one+1, 16);	/* Another variant. */
-  check(strpbrk(one, "efgh") == one+6, 17);	/* And yet another. */
-}
-
-static void
-test_strstr (void)
-{
-  it = "strstr";
-  check(strstr("abcd", "z") == NULL, 1);	/* Not found. */
-  check(strstr("abcd", "abx") == NULL, 2);	/* Dead end. */
-  (void) strcpy(one, "abcd");
-  check(strstr(one, "c") == one+2, 3);	/* Basic test. */
-  check(strstr(one, "bc") == one+1, 4);	/* Multichar. */
-  check(strstr(one, "d") == one+3, 5);	/* End of string. */
-  check(strstr(one, "cd") == one+2, 6);	/* Tail of string. */
-  check(strstr(one, "abc") == one, 7);	/* Beginning. */
-  check(strstr(one, "abcd") == one, 8);	/* Exact match. */
-  check(strstr(one, "abcde") == NULL, 9);	/* Too long. */
-  check(strstr(one, "de") == NULL, 10);	/* Past end. */
-  check(strstr(one, "") == one, 11);	/* Finding empty. */
-  (void) strcpy(one, "ababa");
-  check(strstr(one, "ba") == one+1, 12);	/* Finding first. */
-  (void) strcpy(one, "");
-  check(strstr(one, "b") == NULL, 13);	/* Empty string. */
-  check(strstr(one, "") == one, 14);	/* Empty in empty string. */
-  (void) strcpy(one, "bcbca");
-  check(strstr(one, "bca") == one+2, 15);	/* False start. */
-  (void) strcpy(one, "bbbcabbca");
-  check(strstr(one, "bbca") == one+1, 16);	/* With overlap. */
-}
-
-static void
-test_strspn (void)
-{
-  it = "strspn";
-  check(strspn("abcba", "abc") == 5, 1);	/* Whole string. */
-  check(strspn("abcba", "ab") == 2, 2);	/* Partial. */
-  check(strspn("abc", "qx") == 0, 3);	/* None. */
-  check(strspn("", "ab") == 0, 4);	/* Null string. */
-  check(strspn("abc", "") == 0, 5);	/* Null search list. */
-}
-
-static void
-test_strcspn (void)
-{
-  it = "strcspn";
-  check(strcspn("abcba", "qx") == 5, 1);	/* Whole string. */
-  check(strcspn("abcba", "cx") == 2, 2);	/* Partial. */
-  check(strcspn("abc", "abc") == 0, 3);	/* None. */
-  check(strcspn("", "ab") == 0, 4);	/* Null string. */
-  check(strcspn("abc", "") == 3, 5);	/* Null search list. */
-}
-
-static void
-test_strtok (void)
-{
-  it = "strtok";
-  (void) strcpy(one, "first, second, third");
-  equal(strtok(one, ", "), "first", 1);	/* Basic test. */
-  equal(one, "first", 2);
-  equal(strtok((char *)NULL, ", "), "second", 3);
-  equal(strtok((char *)NULL, ", "), "third", 4);
-  check(strtok((char *)NULL, ", ") == NULL, 5);
-  (void) strcpy(one, ", first, ");
-  equal(strtok(one, ", "), "first", 6);	/* Extra delims, 1 tok. */
-  check(strtok((char *)NULL, ", ") == NULL, 7);
-  (void) strcpy(one, "1a, 1b; 2a, 2b");
-  equal(strtok(one, ", "), "1a", 8);	/* Changing delim lists. */
-  equal(strtok((char *)NULL, "; "), "1b", 9);
-  equal(strtok((char *)NULL, ", "), "2a", 10);
-  (void) strcpy(two, "x-y");
-  equal(strtok(two, "-"), "x", 11);	/* New string before done. */
-  equal(strtok((char *)NULL, "-"), "y", 12);
-  check(strtok((char *)NULL, "-") == NULL, 13);
-  (void) strcpy(one, "a,b, c,, ,d");
-  equal(strtok(one, ", "), "a", 14);	/* Different separators. */
-  equal(strtok((char *)NULL, ", "), "b", 15);
-  equal(strtok((char *)NULL, " ,"), "c", 16);	/* Permute list too. */
-  equal(strtok((char *)NULL, " ,"), "d", 17);
-  check(strtok((char *)NULL, ", ") == NULL, 18);
-  check(strtok((char *)NULL, ", ") == NULL, 19);	/* Persistence. */
-  (void) strcpy(one, ", ");
-  check(strtok(one, ", ") == NULL, 20);	/* No tokens. */
-  (void) strcpy(one, "");
-  check(strtok(one, ", ") == NULL, 21);	/* Empty string. */
-  (void) strcpy(one, "abc");
-  equal(strtok(one, ", "), "abc", 22);	/* No delimiters. */
-  check(strtok((char *)NULL, ", ") == NULL, 23);
-  (void) strcpy(one, "abc");
-  equal(strtok(one, ""), "abc", 24);	/* Empty delimiter list. */
-  check(strtok((char *)NULL, "") == NULL, 25);
-  (void) strcpy(one, "abcdefgh");
-  (void) strcpy(one, "a,b,c");
-  equal(strtok(one, ","), "a", 26);	/* Basics again... */
-  equal(strtok((char *)NULL, ","), "b", 27);
-  equal(strtok((char *)NULL, ","), "c", 28);
-  check(strtok((char *)NULL, ",") == NULL, 29);
-  equal(one+6, "gh", 30);			/* Stomped past end? */
-  equal(one, "a", 31);			/* Stomped old tokens? */
-  equal(one+2, "b", 32);
-  equal(one+4, "c", 33);
-}
-
-static void
-test_strtok_r (void)
-{
-  it = "strtok_r";
-  (void) strcpy(one, "first, second, third");
-  cp = NULL;	/* Always initialize cp to make sure it doesn't point to some old data.  */
-  equal(strtok_r(one, ", ", &cp), "first", 1);	/* Basic test. */
-  equal(one, "first", 2);
-  equal(strtok_r((char *)NULL, ", ", &cp), "second", 3);
-  equal(strtok_r((char *)NULL, ", ", &cp), "third", 4);
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 5);
-  (void) strcpy(one, ", first, ");
-  cp = NULL;
-  equal(strtok_r(one, ", ", &cp), "first", 6);	/* Extra delims, 1 tok. */
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 7);
-  (void) strcpy(one, "1a, 1b; 2a, 2b");
-  cp = NULL;
-  equal(strtok_r(one, ", ", &cp), "1a", 8);	/* Changing delim lists. */
-  equal(strtok_r((char *)NULL, "; ", &cp), "1b", 9);
-  equal(strtok_r((char *)NULL, ", ", &cp), "2a", 10);
-  (void) strcpy(two, "x-y");
-  cp = NULL;
-  equal(strtok_r(two, "-", &cp), "x", 11);	/* New string before done. */
-  equal(strtok_r((char *)NULL, "-", &cp), "y", 12);
-  check(strtok_r((char *)NULL, "-", &cp) == NULL, 13);
-  (void) strcpy(one, "a,b, c,, ,d");
-  cp = NULL;
-  equal(strtok_r(one, ", ", &cp), "a", 14);	/* Different separators. */
-  equal(strtok_r((char *)NULL, ", ", &cp), "b", 15);
-  equal(strtok_r((char *)NULL, " ,", &cp), "c", 16);	/* Permute list too. */
-  equal(strtok_r((char *)NULL, " ,", &cp), "d", 17);
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 18);
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 19);	/* Persistence. */
-  (void) strcpy(one, ", ");
-  cp = NULL;
-  check(strtok_r(one, ", ", &cp) == NULL, 20);	/* No tokens. */
-  (void) strcpy(one, "");
-  cp = NULL;
-  check(strtok_r(one, ", ", &cp) == NULL, 21);	/* Empty string. */
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 22);	/* Persistence. */
-  (void) strcpy(one, "abc");
-  cp = NULL;
-  equal(strtok_r(one, ", ", &cp), "abc", 23);	/* No delimiters. */
-  check(strtok_r((char *)NULL, ", ", &cp) == NULL, 24);
-  (void) strcpy(one, "abc");
-  cp = NULL;
-  equal(strtok_r(one, "", &cp), "abc", 25);	/* Empty delimiter list. */
-  check(strtok_r((char *)NULL, "", &cp) == NULL, 26);
-  (void) strcpy(one, "abcdefgh");
-  (void) strcpy(one, "a,b,c");
-  cp = NULL;
-  equal(strtok_r(one, ",", &cp), "a", 27);	/* Basics again... */
-  equal(strtok_r((char *)NULL, ",", &cp), "b", 28);
-  equal(strtok_r((char *)NULL, ",", &cp), "c", 29);
-  check(strtok_r((char *)NULL, ",", &cp) == NULL, 30);
-  equal(one+6, "gh", 31);			/* Stomped past end? */
-  equal(one, "a", 32);			/* Stomped old tokens? */
-  equal(one+2, "b", 33);
-  equal(one+4, "c", 34);
-}
-
-static void
-test_strsep (void)
-{
-  char *ptr;
-  it = "strsep";
-  cp = strcpy(one, "first, second, third");
-  equal(strsep(&cp, ", "), "first", 1);	/* Basic test. */
-  equal(one, "first", 2);
-  equal(strsep(&cp, ", "), "", 3);
-  equal(strsep(&cp, ", "), "second", 4);
-  equal(strsep(&cp, ", "), "", 5);
-  equal(strsep(&cp, ", "), "third", 6);
-  check(strsep(&cp, ", ") == NULL, 7);
-  cp = strcpy(one, ", first, ");
-  equal(strsep(&cp, ", "), "", 8);
-  equal(strsep(&cp, ", "), "", 9);
-  equal(strsep(&cp, ", "), "first", 10);	/* Extra delims, 1 tok. */
-  equal(strsep(&cp, ", "), "", 11);
-  equal(strsep(&cp, ", "), "", 12);
-  check(strsep(&cp, ", ") == NULL, 13);
-  cp = strcpy(one, "1a, 1b; 2a, 2b");
-  equal(strsep(&cp, ", "), "1a", 14);	/* Changing delim lists. */
-  equal(strsep(&cp, ", "), "", 15);
-  equal(strsep(&cp, "; "), "1b", 16);
-  equal(strsep(&cp, ", "), "", 17);
-  equal(strsep(&cp, ", "), "2a", 18);
-  cp = strcpy(two, "x-y");
-  equal(strsep(&cp, "-"), "x", 19);	/* New string before done. */
-  equal(strsep(&cp, "-"), "y", 20);
-  check(strsep(&cp, "-") == NULL, 21);
-  cp = strcpy(one, "a,b, c,, ,d ");
-  equal(strsep(&cp, ", "), "a", 22);	/* Different separators. */
-  equal(strsep(&cp, ", "), "b", 23);
-  equal(strsep(&cp, " ,"), "", 24);
-  equal(strsep(&cp, " ,"), "c", 25);	/* Permute list too. */
-  equal(strsep(&cp, " ,"), "", 26);
-  equal(strsep(&cp, " ,"), "", 27);
-  equal(strsep(&cp, " ,"), "", 28);
-  equal(strsep(&cp, " ,"), "d", 29);
-  equal(strsep(&cp, " ,"), "", 30);
-  check(strsep(&cp, ", ") == NULL, 31);
-  check(strsep(&cp, ", ") == NULL, 32);	/* Persistence. */
-  cp = strcpy(one, ", ");
-  equal(strsep(&cp, ", "), "", 33);
-  equal(strsep(&cp, ", "), "", 34);
-  equal(strsep(&cp, ", "), "", 35);
-  check(strsep(&cp, ", ") == NULL, 36);	/* No tokens. */
-  cp = strcpy(one, "");
-  equal(strsep(&cp, ", "), "", 37);
-  check(strsep(&cp, ", ") == NULL, 38);	/* Empty string. */
-  cp = strcpy(one, "abc");
-  equal(strsep(&cp, ", "), "abc", 39);	/* No delimiters. */
-  check(strsep(&cp, ", ") == NULL, 40);
-  cp = strcpy(one, "abc");
-  equal(strsep(&cp, ""), "abc", 41);	/* Empty delimiter list. */
-  check(strsep(&cp, "") == NULL, 42);
-  (void) strcpy(one, "abcdefgh");
-  cp = strcpy(one, "a,b,c");
-  equal(strsep(&cp, ","), "a", 43);	/* Basics again... */
-  equal(strsep(&cp, ","), "b", 44);
-  equal(strsep(&cp, ","), "c", 45);
-  check(strsep(&cp, ",") == NULL, 46);
-  equal(one+6, "gh", 47);		/* Stomped past end? */
-  equal(one, "a", 48);			/* Stomped old tokens? */
-  equal(one+2, "b", 49);
-  equal(one+4, "c", 50);
-
-  {
-    char text[] = "This,is,a,test";
-    char *list = strdupa (text);
-    equal (strsep (&list, ","), "This", 51);
-    equal (strsep (&list, ","), "is", 52);
-    equal (strsep (&list, ","), "a", 53);
-    equal (strsep (&list, ","), "test", 54);
-    check (strsep (&list, ",") == NULL, 55);
-  }
-
-  cp = strcpy(one, "a,b, c,, ,d,");
-  equal(strsep(&cp, ","), "a", 56);	/* Different separators. */
-  equal(strsep(&cp, ","), "b", 57);
-  equal(strsep(&cp, ","), " c", 58);	/* Permute list too. */
-  equal(strsep(&cp, ","), "", 59);
-  equal(strsep(&cp, ","), " ", 60);
-  equal(strsep(&cp, ","), "d", 61);
-  equal(strsep(&cp, ","), "", 62);
-  check(strsep(&cp, ",") == NULL, 63);
-  check(strsep(&cp, ",") == NULL, 64);	/* Persistence. */
-
-  cp = strcpy(one, "a,b, c,, ,d,");
-  equal(strsep(&cp, "xy,"), "a", 65);	/* Different separators. */
-  equal(strsep(&cp, "x,y"), "b", 66);
-  equal(strsep(&cp, ",xy"), " c", 67);	/* Permute list too. */
-  equal(strsep(&cp, "xy,"), "", 68);
-  equal(strsep(&cp, "x,y"), " ", 69);
-  equal(strsep(&cp, ",xy"), "d", 70);
-  equal(strsep(&cp, "xy,"), "", 71);
-  check(strsep(&cp, "x,y") == NULL, 72);
-  check(strsep(&cp, ",xy") == NULL, 73);	/* Persistence. */
-
-  cp = strcpy(one, "ABC");
-  one[4] = ':';
-  equal(strsep(&cp, "C"), "AB", 74);	/* Access beyond NUL.  */
-  ptr = strsep(&cp, ":");
-  equal(ptr, "", 75);
-  check(ptr == one + 3, 76);
-  check(cp == NULL, 77);
-
-  cp = strcpy(one, "ABC");
-  one[4] = ':';
-  equal(strsep(&cp, "CD"), "AB", 78);	/* Access beyond NUL.  */
-  ptr = strsep(&cp, ":.");
-  equal(ptr, "", 79);
-  check(ptr == one + 3, 80);
-
-  cp = strcpy(one, "ABC");		/* No token in string.  */
-  equal(strsep(&cp, ","), "ABC", 81);
-  check(cp == NULL, 82);
-
-  *one = '\0';				/* Empty string. */
-  cp = one;
-  ptr = strsep(&cp, ",");
-  equal(ptr, "", 83);
-  check(ptr == one, 84);
-  check(cp == NULL, 85);
-
-  *one = '\0';				/* Empty string and no token. */
-  cp = one;
-  ptr = strsep(&cp, "");
-  equal(ptr, "", 86);
-  check(ptr == one , 87);
-  check(cp == NULL, 88);
-}
-
-static void
-test_memcmp (void)
-{
-  int i, cnt = 1;
-  char one[21], two[21];
-
-  it = "memcmp";
-  check(memcmp("a", "a", 1) == 0, cnt++);	/* Identity. */
-  check(memcmp("abc", "abc", 3) == 0, cnt++);	/* Multicharacter. */
-  check(memcmp("abcd", "abcf", 4) < 0, cnt++);	/* Honestly unequal. */
-  check(memcmp("abcf", "abcd", 4) > 0, cnt++);
-  check(memcmp("alph", "cold", 4) < 0, cnt++);
-  check(memcmp("a\203", "a\003", 2) > 0, cnt++);
-  check(memcmp("a\003", "a\203", 2) < 0, cnt++);
-  check(memcmp("a\003bc", "a\203bc", 2) < 0, cnt++);
-  check(memcmp("abc\203", "abc\003", 4) > 0, cnt++);
-  check(memcmp("abc\003", "abc\203", 4) < 0, cnt++);
-  check(memcmp("abcf", "abcd", 3) == 0, cnt++);	/* Count limited. */
-  check(memcmp("abc", "def", 0) == 0, cnt++);	/* Zero count. */
-  /* Comparisons with shifting 4-byte boundaries. */
-  for (i=0; i<4; i++)
-  {
-    char *a = one + i, *b = two + i;
-    strncpy( a, "--------11112222", 16);
-    strncpy( b, "--------33334444", 16);
-    check( memcmp(b, a, 16) > 0, cnt++);
-    check( memcmp(a, b, 16) < 0, cnt++);
-  }
-}
-
-static void
-test_memchr (void)
-{
-  it = "memchr";
-  check(memchr("abcd", 'z', 4) == NULL, 1);	/* Not found. */
-  (void) strcpy(one, "abcd");
-  check(memchr(one, 'c', 4) == one+2, 2);	/* Basic test. */
-  check(memchr(one, ~0xff|'c', 4) == one+2, 2);	/* ignore highorder bits. */
-  check(memchr(one, 'd', 4) == one+3, 3);	/* End of string. */
-  check(memchr(one, 'a', 4) == one, 4);	/* Beginning. */
-  check(memchr(one, '\0', 5) == one+4, 5);	/* Finding NUL. */
-  (void) strcpy(one, "ababa");
-  check(memchr(one, 'b', 5) == one+1, 6);	/* Finding first. */
-  check(memchr(one, 'b', 0) == NULL, 7);	/* Zero count. */
-  check(memchr(one, 'a', 1) == one, 8);	/* Singleton case. */
-  (void) strcpy(one, "a\203b");
-  check(memchr(one, 0203, 3) == one+1, 9);	/* Unsignedness. */
-
-  /* now test all possible alignment and length combinations to catch
-     bugs due to unrolled loops (assuming unrolling is limited to no
-     more than 128 byte chunks: */
-  {
-    char buf[128 + sizeof(long)];
-    long align, len, i, pos;
-
-    for (align = 0; align < (long) sizeof(long); ++align) {
-      for (len = 0; len < (long) (sizeof(buf) - align); ++len) {
-	for (i = 0; i < len; ++i) {
-	  buf[align + i] = 'x';		/* don't depend on memset... */
-	}
-	for (pos = 0; pos < len; ++pos) {
-#if 0
-	  printf("align %d, len %d, pos %d\n", align, len, pos);
-#endif
-	  check(memchr(buf + align, 'x', len) == buf + align + pos, 10);
-	  check(memchr(buf + align, 'x', pos) == NULL, 11);
-	  buf[align + pos] = '-';
-	}
-      }
-    }
-  }
-}
-
-static void
-test_memcpy (void)
-{
-  int i;
-  it = "memcpy";
-  check(memcpy(one, "abc", 4) == one, 1);	/* Returned value. */
-  equal(one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memcpy(one+1, "xyz", 2);
-  equal(one, "axydefgh", 3);		/* Basic test. */
-
-  (void) strcpy(one, "abc");
-  (void) memcpy(one, "xyz", 0);
-  equal(one, "abc", 4);			/* Zero-length copy. */
-
-  (void) strcpy(one, "hi there");
-  (void) strcpy(two, "foo");
-  (void) memcpy(two, one, 9);
-  equal(two, "hi there", 5);		/* Just paranoia. */
-  equal(one, "hi there", 6);		/* Stomped on source? */
-
-  for (i = 0; i < 16; i++)
-    {
-      const char *x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-      strcpy (one, x);
-      check (memcpy (one + i, "hi there", 9) == one + i,
-	     7 + (i * 6));		/* Unaligned destination. */
-      check (memcmp (one, x, i) == 0, 8 + (i * 6));  /* Wrote under? */
-      equal (one + i, "hi there", 9 + (i * 6));
-      check (one[i + 9] == 'x', 10 + (i * 6));       /* Wrote over? */
-      check (memcpy (two, one + i, 9) == two,
-	     11 + (i * 6));		/* Unaligned source. */
-      equal (two, "hi there", 12 + (i * 6));
-    }
-}
-
-static void
-test_mempcpy (void)
-{
-  int i;
-  it = "mempcpy";
-  check(mempcpy(one, "abc", 4) == one + 4, 1);	/* Returned value. */
-  equal(one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) mempcpy(one+1, "xyz", 2);
-  equal(one, "axydefgh", 3);		/* Basic test. */
-
-  (void) strcpy(one, "abc");
-  (void) mempcpy(one, "xyz", 0);
-  equal(one, "abc", 4);			/* Zero-length copy. */
-
-  (void) strcpy(one, "hi there");
-  (void) strcpy(two, "foo");
-  (void) mempcpy(two, one, 9);
-  equal(two, "hi there", 5);		/* Just paranoia. */
-  equal(one, "hi there", 6);		/* Stomped on source? */
-
-  for (i = 0; i < 16; i++)
-    {
-      const char *x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-      strcpy (one, x);
-      check (mempcpy (one + i, "hi there", 9) == one + i + 9,
-	     7 + (i * 6));		/* Unaligned destination. */
-      check (memcmp (one, x, i) == 0, 8 + (i * 6));  /* Wrote under? */
-      equal (one + i, "hi there", 9 + (i * 6));
-      check (one[i + 9] == 'x', 10 + (i * 6));       /* Wrote over? */
-      check (mempcpy (two, one + i, 9) == two + 9,
-	     11 + (i * 6));		/* Unaligned source. */
-      equal (two, "hi there", 12 + (i * 6));
-    }
-}
-
-static void
-test_memmove (void)
-{
-  it = "memmove";
-  check(memmove(one, "abc", 4) == one, 1);	/* Returned value. */
-  equal(one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memmove(one+1, "xyz", 2);
-  equal(one, "axydefgh", 3);		/* Basic test. */
-
-  (void) strcpy(one, "abc");
-  (void) memmove(one, "xyz", 0);
-  equal(one, "abc", 4);			/* Zero-length copy. */
-
-  (void) strcpy(one, "hi there");
-  (void) strcpy(two, "foo");
-  (void) memmove(two, one, 9);
-  equal(two, "hi there", 5);		/* Just paranoia. */
-  equal(one, "hi there", 6);		/* Stomped on source? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memmove(one+1, one, 9);
-  equal(one, "aabcdefgh", 7);		/* Overlap, right-to-left. */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memmove(one+1, one+2, 7);
-  equal(one, "acdefgh", 8);		/* Overlap, left-to-right. */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memmove(one, one, 9);
-  equal(one, "abcdefgh", 9);		/* 100% overlap. */
-}
-
-static void
-test_memccpy (void)
-{
-  /* First test like memcpy, then the search part The SVID, the only
-     place where memccpy is mentioned, says overlap might fail, so we
-     don't try it.  Besides, it's hard to see the rationale for a
-     non-left-to-right memccpy.  */
-  it = "memccpy";
-  check(memccpy(one, "abc", 'q', 4) == NULL, 1);	/* Returned value. */
-  equal(one, "abc", 2);			/* Did the copy go right? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) memccpy(one+1, "xyz", 'q', 2);
-  equal(one, "axydefgh", 3);		/* Basic test. */
-
-  (void) strcpy(one, "abc");
-  (void) memccpy(one, "xyz", 'q', 0);
-  equal(one, "abc", 4);			/* Zero-length copy. */
-
-  (void) strcpy(one, "hi there");
-  (void) strcpy(two, "foo");
-  (void) memccpy(two, one, 'q', 9);
-  equal(two, "hi there", 5);		/* Just paranoia. */
-  equal(one, "hi there", 6);		/* Stomped on source? */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) strcpy(two, "horsefeathers");
-  check(memccpy(two, one, 'f', 9) == two+6, 7);	/* Returned value. */
-  equal(one, "abcdefgh", 8);		/* Source intact? */
-  equal(two, "abcdefeathers", 9);		/* Copy correct? */
-
-  (void) strcpy(one, "abcd");
-  (void) strcpy(two, "bumblebee");
-  check(memccpy(two, one, 'a', 4) == two+1, 10);	/* First char. */
-  equal(two, "aumblebee", 11);
-  check(memccpy(two, one, 'd', 4) == two+4, 12);	/* Last char. */
-  equal(two, "abcdlebee", 13);
-  (void) strcpy(one, "xyz");
-  check(memccpy(two, one, 'x', 1) == two+1, 14);	/* Singleton. */
-  equal(two, "xbcdlebee", 15);
-}
-
-static void
-test_memset (void)
-{
-  int i;
-
-  it = "memset";
-  (void) strcpy(one, "abcdefgh");
-  check(memset(one+1, 'x', 3) == one+1, 1);	/* Return value. */
-  equal(one, "axxxefgh", 2);		/* Basic test. */
-
-  (void) memset(one+2, 'y', 0);
-  equal(one, "axxxefgh", 3);		/* Zero-length set. */
-
-  (void) memset(one+5, 0, 1);
-  equal(one, "axxxe", 4);			/* Zero fill. */
-  equal(one+6, "gh", 5);			/* And the leftover. */
-
-  (void) memset(one+2, 010045, 1);
-  equal(one, "ax\045xe", 6);		/* Unsigned char convert. */
-
-  /* Non-8bit fill character.  */
-  memset (one, 0x101, sizeof (one));
-  for (i = 0; i < (int) sizeof (one); ++i)
-    check (one[i] == '\01', 7);
-
-  /* Test for more complex versions of memset, for all alignments and
-     lengths up to 256. This test takes a little while, perhaps it should
-     be made weaker?  */
-  {
-    char data[512];
-    int j;
-    int k;
-    int c;
-
-    for (i = 0; i < 512; i++)
-      data[i] = 'x';
-    for (c = 0; c <= 'y'; c += 'y')  /* check for memset(,0,) and
-					memset(,'y',) */
-      for (j = 0; j < 256; j++)
-	for (i = 0; i < 256; i++)
-	  {
-	    memset (data + i, c, j);
-	    for (k = 0; k < i; k++)
-	      if (data[k] != 'x')
-		goto fail;
-	    for (k = i; k < i+j; k++)
-	      {
-		if (data[k] != c)
-		  goto fail;
-		data[k] = 'x';
-	      }
-	    for (k = i+j; k < 512; k++)
-	      if (data[k] != 'x')
-		goto fail;
-	    continue;
-
-	  fail:
-	    check (0, 8 + i + j * 256 + (c != 0) * 256 * 256);
-	  }
-  }
-}
-
-static void
-test_bcopy (void)
-{
-#ifdef __TEST_SUSV3_LEGACY__
-  /* Much like memcpy.  Berklix manual is silent about overlap, so
-     don't test it.  */
-  it = "bcopy";
-  (void) bcopy("abc", one, 4);
-  equal(one, "abc", 1);			/* Simple copy. */
-
-  (void) strcpy(one, "abcdefgh");
-  (void) bcopy("xyz", one+1, 2);
-  equal(one, "axydefgh", 2);		/* Basic test. */
-
-  (void) strcpy(one, "abc");
-  (void) bcopy("xyz", one, 0);
-  equal(one, "abc", 3);			/* Zero-length copy. */
-
-  (void) strcpy(one, "hi there");
-  (void) strcpy(two, "foo");
-  (void) bcopy(one, two, 9);
-  equal(two, "hi there", 4);		/* Just paranoia. */
-  equal(one, "hi there", 5);		/* Stomped on source? */
-#endif
-}
-
-static void
-test_bzero (void)
-{
-#ifdef __TEST_SUSV3_LEGACY__
-  it = "bzero";
-  (void) strcpy(one, "abcdef");
-  bzero(one+2, 2);
-  equal(one, "ab", 1);			/* Basic test. */
-  equal(one+3, "", 2);
-  equal(one+4, "ef", 3);
-
-  (void) strcpy(one, "abcdef");
-  bzero(one+2, 0);
-  equal(one, "abcdef", 4);		/* Zero-length copy. */
-#endif
-}
-
-static void
-test_strndup (void)
-{
-  char *p, *q;
-  it = "strndup";
-  p = strndup("abcdef", 12);
-  check(p != NULL, 1);
-  if (p != NULL)
-    {
-      equal(p, "abcdef", 2);
-      q = strndup(p + 1, 2);
-      check(q != NULL, 3);
-      if (q != NULL)
-	equal(q, "bc", 4);
-      free (q);
-    }
-  free (p);
-  p = strndup("abc def", 3);
-  check(p != NULL, 5);
-  if (p != NULL)
-    equal(p, "abc", 6);
-  free (p);
-}
-
-static void
-test_bcmp (void)
-{
-#ifdef __TEST_SUSV3_LEGACY__
-  it = "bcmp";
-  check(bcmp("a", "a", 1) == 0, 1);	/* Identity. */
-  check(bcmp("abc", "abc", 3) == 0, 2);	/* Multicharacter. */
-  check(bcmp("abcd", "abce", 4) != 0, 3);	/* Honestly unequal. */
-  check(bcmp("abce", "abcd", 4) != 0, 4);
-  check(bcmp("alph", "beta", 4) != 0, 5);
-  check(bcmp("abce", "abcd", 3) == 0, 6);	/* Count limited. */
-  check(bcmp("abc", "def", 0) == 0, 8);	/* Zero count. */
-#endif
-}
-
-static void
-test_strerror (void)
-{
-  it = "strerror";
-  check(strerror(EDOM) != 0, 1);
-  check(strerror(ERANGE) != 0, 2);
-  check(strerror(ENOENT) != 0, 3);
-}
-
-static void
-test_strcasecmp (void)
-{
-  it = "strcasecmp";
-  /* Note that the locale is "C".  */
-  check(strcasecmp("a", "a") == 0, 1);
-  check(strcasecmp("a", "A") == 0, 2);
-  check(strcasecmp("A", "a") == 0, 3);
-  check(strcasecmp("a", "b") < 0, 4);
-  check(strcasecmp("c", "b") > 0, 5);
-  check(strcasecmp("abc", "AbC") == 0, 6);
-  check(strcasecmp("0123456789", "0123456789") == 0, 7);
-  check(strcasecmp("", "0123456789") < 0, 8);
-  check(strcasecmp("AbC", "") > 0, 9);
-  check(strcasecmp("AbC", "A") > 0, 10);
-  check(strcasecmp("AbC", "Ab") > 0, 11);
-  check(strcasecmp("AbC", "ab") > 0, 12);
-}
-
-static void
-test_strncasecmp (void)
-{
-  it = "strncasecmp";
-  /* Note that the locale is "C".  */
-  check(strncasecmp("a", "a", 5) == 0, 1);
-  check(strncasecmp("a", "A", 5) == 0, 2);
-  check(strncasecmp("A", "a", 5) == 0, 3);
-  check(strncasecmp("a", "b", 5) < 0, 4);
-  check(strncasecmp("c", "b", 5) > 0, 5);
-  check(strncasecmp("abc", "AbC", 5) == 0, 6);
-  check(strncasecmp("0123456789", "0123456789", 10) == 0, 7);
-  check(strncasecmp("", "0123456789", 10) < 0, 8);
-  check(strncasecmp("AbC", "", 5) > 0, 9);
-  check(strncasecmp("AbC", "A", 5) > 0, 10);
-  check(strncasecmp("AbC", "Ab", 5) > 0, 11);
-  check(strncasecmp("AbC", "ab", 5) > 0, 12);
-  check(strncasecmp("0123456789", "AbC", 0) == 0, 13);
-  check(strncasecmp("AbC", "abc", 1) == 0, 14);
-  check(strncasecmp("AbC", "abc", 2) == 0, 15);
-  check(strncasecmp("AbC", "abc", 3) == 0, 16);
-  check(strncasecmp("AbC", "abcd", 3) == 0, 17);
-  check(strncasecmp("AbC", "abcd", 4) < 0, 18);
-  check(strncasecmp("ADC", "abcd", 1) == 0, 19);
-  check(strncasecmp("ADC", "abcd", 2) > 0, 20);
-}
-
-int
-main (void)
-{
-  int status;
-
-  /* Test strcmp first because we use it to test other things.  */
-  test_strcmp ();
-
-  /* Test strcpy next because we need it to set up other tests.  */
-  test_strcpy ();
-
-  /* A closely related function is stpcpy.  */
-  test_stpcpy ();
-
-  /* stpncpy.  */
-  test_stpncpy ();
-
-  /* strcat.  */
-  test_strcat ();
-
-  /* strncat.  */
-  test_strncat ();
-
-  /* strlcat.  */
-  test_strlcat ();
-
-  /* strncmp.  */
-  test_strncmp ();
-
-  /* strncpy.  */
-  test_strncpy ();
-
-  /* strlcpy.  */
-  test_strlcpy ();
-
-  /* strlen.  */
-  test_strlen ();
-
-  /* strnlen.  */
-  test_strnlen ();
-
-  /* strchr.  */
-  test_strchr ();
-
-  /* strchrnul.  */
-  test_strchrnul ();
-
-  /* rawmemchr.  */
-  test_rawmemchr ();
-
-  /* index - just like strchr.  */
-  test_index ();
-
-  /* strrchr.  */
-  test_strrchr ();
-
-  /* memrchr.  */
-  test_memrchr ();
-
-  /* rindex - just like strrchr.  */
-  test_rindex ();
-
-  /* strpbrk - somewhat like strchr.  */
-  test_strpbrk ();
-
-  /* strstr - somewhat like strchr.  */
-  test_strstr ();
-
-  /* strspn.  */
-  test_strspn ();
-
-  /* strcspn.  */
-  test_strcspn ();
-
-  /* strtok - the hard one.  */
-  test_strtok ();
-
-  /* strtok_r.  */
-  test_strtok_r ();
-
-  /* strsep.  */
-  test_strsep ();
-
-  /* memcmp.  */
-  test_memcmp ();
-
-  /* memchr.  */
-  test_memchr ();
-
-  /* memcpy - need not work for overlap.  */
-  test_memcpy ();
-
-  /* memmove - must work on overlap.  */
-  test_memmove ();
-
-  /* mempcpy */
-  test_mempcpy ();
-
-  /* memccpy.  */
-  test_memccpy ();
-
-  /* memset.  */
-  test_memset ();
-
-  /* bcopy.  */
-  test_bcopy ();
-
-  /* bzero.  */
-  test_bzero ();
-
-  /* bcmp - somewhat like memcmp.  */
-  test_bcmp ();
-
-  /* strndup.  */
-  test_strndup ();
-
-  /* strerror - VERY system-dependent.  */
-  test_strerror ();
-
-  /* strcasecmp.  Without locale dependencies.  */
-  test_strcasecmp ();
-
-  /* strncasecmp.  Without locale dependencies.  */
-  test_strncasecmp ();
-
-  if (errors == 0)
-    {
-      status = EXIT_SUCCESS;
-      puts("No errors.");
-    }
-  else
-    {
-      status = EXIT_FAILURE;
-      printf("%Zd errors.\n", errors);
-    }
-
-  return status;
-}
diff --git a/test/string/tst-bswap.c b/test/string/tst-bswap.c
deleted file mode 100644
index 52a271814..000000000
--- a/test/string/tst-bswap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>.
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <byteswap.h>
-#include <stdio.h>
-
-extern unsigned long long int wash (unsigned long long int a);
-
-int
-main (void)
-{
-  int result = 0;
-
-  /* Test the functions with constant arguments.  */
-  if (bswap_16 (0x1234) != 0x3412)
-    {
-      puts ("bswap_16 (constant) flunked");
-      result = 1;
-    }
-  if (bswap_32 (0x12345678) != 0x78563412)
-    {
-      puts ("bswap_32 (constant) flunked");
-      result = 1;
-    }
-  if (bswap_64 (0x1234567890abcdefULL) != 0xefcdab9078563412ULL)
-    {
-      puts ("bswap_64 (constant) flunked");
-      result = 1;
-    }
-
-  /* Test the functions with non-constant arguments.  */
-  if (bswap_16 (wash (0x1234)) != 0x3412)
-    {
-      puts ("bswap_16 (non-constant) flunked");
-      result = 1;
-    }
-  if (bswap_32 (wash (0x12345678)) != 0x78563412)
-    {
-      puts ("bswap_32 (non-constant) flunked");
-      result = 1;
-    }
-  if (bswap_64 (wash (0x1234567890abcdefULL)) != 0xefcdab9078563412ULL)
-    {
-      puts ("bswap_64 (non-constant) flunked");
-      result = 1;
-    }
-
-  return result;
-}
-
-
-unsigned long long int
-wash (unsigned long long int a)
-{
-  /* Do nothing.  This function simply exists to avoid that the compiler
-     regards the argument to the bswap_*() functions as constant.  */
-  return a + 0;
-}
diff --git a/test/string/tst-inlcall.c b/test/string/tst-inlcall.c
deleted file mode 100644
index 7e2eba37e..000000000
--- a/test/string/tst-inlcall.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Tester for calling inline string functions.
-   Copyright (C) 1998, 2000, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-/* Make sure we test the optimized inline functions.  */
-#define __USE_STRING_INLINES	1
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <fcntl.h>
-
-
-int
-main (void)
-{
-  int status;
-  int errors = 0;
-  char buf1[1000];
-  char *cp;
-  char ch;
-
-  cp = strcpy (buf1, "hello world");
-  if (strcmp ("hello world", cp++) != 0)
-    {
-      puts ("strcmp test 1 failed");
-      ++errors;
-    }
-
-  cp = buf1;
-  if (strcmp (cp++, "hello world") != 0)
-    {
-      puts ("strcmp test 2 failed");
-      ++errors;
-    }
-
-  ch = 'h';
-  if (strchr ("hello world", ch++) == NULL)
-    {
-      puts ("strchr test 1 failed");
-      ++errors;
-    }
-
-  const char * const hw = "hello world";
-  if (strpbrk (hw, "o") - hw != 4)
-    {
-      puts ("strpbrk test 1 failed");
-      ++errors;
-    }
-
-  if (errors == 0)
-    {
-      status = EXIT_SUCCESS;
-      puts ("No errors.");
-    }
-  else
-    {
-      status = EXIT_FAILURE;
-      printf ("%d errors.\n", errors);
-    }
-  return status;
-}
diff --git a/test/string/tst-memmove.c b/test/string/tst-memmove.c
deleted file mode 100644
index 2adc52740..000000000
--- a/test/string/tst-memmove.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 Rene Nielsen <rene.nielsen@microsemi.com>
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#define LEN 1024
-
-int main(int argc, char *argv[])
-{
-    unsigned char a[LEN], exp;
-    int i, move_len, move_src, err = 0;
-
-    // Fill the array with increasing values from 0 to LEN - 1 (wrap is fine)
-    for (i = 0; i < LEN; i++) {
-        a[i] = i;
-    }
-
-    // move_src is the index into the array to move from.
-    // move_len is the number of indices to move. Here, we take the remainder.
-    move_src = LEN / 64;
-    move_len = LEN - move_src;
-
-    printf("Moving %d entries from index %d to 0\n", move_len, move_src);
-    memmove(a, &a[move_src], sizeof(a[0]) * move_len);
-
-    // Check that the memmove went well
-    for (i = 0; i < LEN; i++) {
-        // Expect that the first #move_len entries contain increasing values
-        // starting at #move_src and the last #move_src entries are untouched.
-        exp = i >= move_len ? i : i + move_src;
-        if (a[i] != exp) {
-            printf("Error: memmove() failed. Expected a[%d] = %u, got %u\n", i, exp, a[i]);
-            err = 1;
-        }
-    }
-
-    if (!err) {
-       printf("memmove() succeeded\n");
-    }
-
-    return err;
-}
-
diff --git a/test/string/tst-strlen.c b/test/string/tst-strlen.c
deleted file mode 100644
index a1e115927..000000000
--- a/test/string/tst-strlen.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Make sure we don't test the optimized inline functions if we want to
-   test the real implementation.  */
-#undef __USE_STRING_INLINES
-
-#include <stdio.h>
-#include <string.h>
-
-int
-main(int argc, char *argv[])
-{
-  static const size_t lens[] = { 0, 1, 0, 2, 0, 1, 0, 3,
-				 0, 1, 0, 2, 0, 1, 0, 4 };
-  char basebuf[24 + 32];
-  size_t base;
-
-  for (base = 0; base < 32; ++base)
-    {
-      char *buf = basebuf + base;
-      size_t words;
-
-      for (words = 0; words < 4; ++words)
-	{
-	  size_t last;
-	  memset (buf, 'a', words * 4);
-
-	  for (last = 0; last < 16; ++last)
-	    {
-	      buf[words * 4 + 0] = (last & 1) != 0 ? 'b' : '\0';
-	      buf[words * 4 + 1] = (last & 2) != 0 ? 'c' : '\0';
-	      buf[words * 4 + 2] = (last & 4) != 0 ? 'd' : '\0';
-	      buf[words * 4 + 3] = (last & 8) != 0 ? 'e' : '\0';
-	      buf[words * 4 + 4] = '\0';
-
-	      if (strlen (buf) != words * 4 + lens[last]
-		  || strnlen (buf, -1) != words * 4 + lens[last])
-		{
-		  printf ("failed for base=%Zu, words=%Zu, and last=%Zu\n",
-			  base, words, last);
-		  return 1;
-		}
-	    }
-	}
-    }
-  return 0;
-}
diff --git a/test/string/tst-strtok.c b/test/string/tst-strtok.c
deleted file mode 100644
index 7e34aeefa..000000000
--- a/test/string/tst-strtok.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Testcase for strtok reported by Andrew Church <achurch@achurch.org>.  */
-#include <stdio.h>
-#include <string.h>
-
-int
-main (void)
-{
-  char buf[1] = { 0 };
-  int result = 0;
-
-  if (strtok (buf, " ") != NULL)
-    {
-      puts ("first strtok call did not return NULL");
-      result = 1;
-    }
-  else if (strtok (NULL, " ") != NULL)
-    {
-      puts ("second strtok call did not return NULL");
-      result = 1;
-    }
-
-  return result;
-}
diff --git a/test/string/tst-strxfrm.c b/test/string/tst-strxfrm.c
deleted file mode 100644
index ff1b396be..000000000
--- a/test/string/tst-strxfrm.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Based on a test case by Paul Eggert.  */
-#include <features.h>
-#ifdef __UCLIBC_HAS_XLOCALE__
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-char const string[] = "";
-
-
-static int
-test (const char *locale)
-{
-  size_t bufsize;
-  size_t r;
-  size_t l;
-  char *buf;
-  locale_t loc;
-  int result = 0;
-
-  if (setlocale (LC_COLLATE, locale) == NULL)
-    {
-      printf ("cannot set locale \"%s\"\n", locale);
-      return 1;
-    }
-  bufsize = strxfrm (NULL, string, 0) + 1;
-  buf = malloc (bufsize);
-  if (buf == NULL)
-    {
-      printf ("cannot allocate %zd bytes\n", bufsize);
-      return 1;
-    }
-  r = strxfrm (buf, string, bufsize);
-  l = strlen (buf);
-  if (r != l)
-    {
-       printf ("locale \"%s\": strxfrm returned %zu, strlen returned %zu\n",
-	       locale, r, l);
-       result = 1;
-    }
-
-  loc = newlocale (1 << LC_ALL, locale, NULL);
-
-  r = strxfrm_l (buf, string, bufsize, loc);
-  l = strlen (buf);
-  if (r != l)
-    {
-       printf ("locale \"%s\": strxfrm_l returned %zu, strlen returned %zu\n",
-	       locale, r, l);
-       result = 1;
-    }
-
-  freelocale (loc);
-
-  free (buf);
-
-  return result;
-}
-
-
-int
-main (void)
-{
-  int result = 0;
-
-  result |= test ("C");
-  result |= test ("en_US.ISO-8859-1");
-  result |= test ("de_DE.UTF-8");
-
-  return result;
-}
-
-#else
-int main(void)
-{
-  return 0;
-}
-#endif