Changeset 2076 for trunk/src/libctests/glibc/string

Timestamp:

Jun 26, 2005, 12:42:04 AM (20 years ago)

Author:

bird

Message:

libc adjustments. extending some testcases.

Location:

trunk/src/libctests/glibc/string

Files:

• test-string.h (modified) (4 diffs, 1 prop)
• tst-strxfrm.c (modified) (4 diffs, 1 prop)

trunk/src/libctests/glibc/string/test-string.h

@@ -25 +25 @@
   long test;
 } impl_t;
+
+#ifdef __EMX__ /* aout based */
+#include <stdint.h>
+extern uintptr_t __impls__;
+asm (".stabs  \"___impls__\", 21, 0, 0, 0xffffffff");
+
+#define IMPL(name, test) \
+  impl_t tst_ ## name = { #name, (void (*) (void))name, test }; \
+   asm (".stabs \"___impls__\", 25, 0, 0, _tst_" #name);
+#else
 extern impl_t __start_impls[], __stop_impls[];
-
 #define IMPL(name, test) \
   impl_t tst_ ## name                                                   \
   __attribute__ ((section ("impls"), aligned (sizeof (void *))))        \
     = { #name, (void (*) (void))name, test };
+#endif
 
 #ifdef TEST_MAIN
@@ -70 +80 @@
     return psz - psz2;
 }
-#endif 
+#endif
 
 
@@ -124 +134 @@
   (* (proto_t) (impl)->fn) (__VA_ARGS__)
 
+#ifdef __EMX__
+#define FOR_EACH_IMPL(impl, notall) \
+    for (uintptr_t *_ptrfirst = __impls__ == -1 ? &__impls__ - 1 : &__impls__; \
+         _ptrfirst; \
+         _ptrfirst = NULL) \
+      for (uintptr_t *_ptr = *_ptrfirst == -2 ? _ptrfirst + 1 :  _ptrfirst + 2; \
+           _ptr && *_ptr != NULL; \
+           _ptr = *_ptrfirst == -2 /* emxomf */ || (_ptr - _ptrfirst < *_ptrfirst /* a.out */ ) ? _ptr + 1 : NULL) \
+        for (impl_t *impl = *(impl_t **)_ptr; impl; impl = NULL) \
+          if (!notall || impl->test)
+#else
 #define FOR_EACH_IMPL(impl, notall) \
   for (impl_t *impl = __start_impls; impl < __stop_impls; ++impl)       \
     if (!notall || impl->test)
+#endif
 
 #define HP_TIMING_BEST(best_time, start, end)   \
@@ -146 +168 @@
     page_size = MIN_PAGE_SIZE;
 #endif
+#ifdef HAVE_MMAP
   buf1 = mmap (0, 2 * page_size, PROT_READ | PROT_WRITE,
                MAP_PRIVATE | MAP_ANON, -1, 0);
   if (buf1 == MAP_FAILED)
     error (EXIT_FAILURE, errno, "mmap failed");
+#else
+  buf1 = memalign (getpagesize (), 2 * page_size);
+  if (!buf1)
+    error (EXIT_FAILURE, errno, "memalign failed");
+#endif
   if (mprotect (buf1 + page_size, page_size, PROT_NONE))
     error (EXIT_FAILURE, errno, "mprotect failed");
+#ifdef HAVE_MMAP
   buf2 = mmap (0, 2 * page_size, PROT_READ | PROT_WRITE,
                MAP_PRIVATE | MAP_ANON, -1, 0);
   if (buf2 == MAP_FAILED)
     error (EXIT_FAILURE, errno, "mmap failed");
+#else
+  buf2 = memalign (getpagesize (), 2 * page_size);
+  if (!buf2)
+    error (EXIT_FAILURE, errno, "memalign failed");
+#endif
   if (mprotect (buf2 + page_size, page_size, PROT_NONE))
     error (EXIT_FAILURE, errno, "mprotect failed");

trunk/src/libctests/glibc/string/tst-strxfrm.c

@@ -6 +6 @@
 
 
-char const string[] = "";
-
-
 static int
-test (const char *locale)
+test (const char *locale, const char *string)
 {
   size_t bufsize;
@@ -18 +15 @@
 #ifdef HAVE_NEWLOCALE
   locale_t loc;
-#endif 
+#endif
   int result = 0;
 
@@ -55 +52 @@
 
   freelocale (loc);
-#endif 
+#endif
 
   free (buf);
@@ -68 +65 @@
   int result = 0;
 
-  result |= test ("C");
-#ifdef __BSD__ /* bsd is missing the aliases. loosers. */
-  result |= test ("en_US.ISO8859-1");
+  result |= test ("C", "");
+  result |= test ("C", "abcABCxyzXYZ|+-/*(%$");
+#ifdef __BSD__ /* BSD is missing the aliases. loosers. */
+  result |= test ("en_US.ISO8859-1", "");
+  result |= test ("en_US.ISO8859-1", "abcABCxyzXYZ|+-/*(%$");
 #else
-  result |= test ("en_US.ISO-8859-1");
-#endif 
-  result |= test ("de_DE.UTF-8");
+  result |= test ("en_US.ISO-8859-1", "");
+  result |= test ("en_US.ISO-8859-1", "abcABCxyzXYZ|+-/*(%$");
+#endif
+  result |= test ("de_DE.UTF-8", "");
+  result |= test ("de_DE.UTF-8", "abcABCxyzXYZ|+-/*(%$");
 
   return result;