Changeset 2076

Timestamp:

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

Author:

bird

Message:

libc adjustments. extending some testcases.

Location:

trunk/src/libctests

Files:

• glibc/Makefile (modified) (20 diffs, 1 prop)
• glibc/string/test-string.h (modified) (4 diffs, 1 prop)
• glibc/string/tst-strxfrm.c (modified) (4 diffs, 1 prop)
• glibc/sysdeps/i386/i686/hp-timing.h (modified) (1 diff, 1 prop)
• glibc/test-skeleton.c (modified) (3 diffs, 1 prop)
• glibc/time/tst-strptime.c (modified) (1 diff, 1 prop)
• glibc/wctype/test_wctype.c (modified) (3 diffs, 1 prop)
• libc/smoketests/lseek-1.c (added)

trunk/src/libctests/glibc/Makefile

@@ -1 +1 @@
 # $Id$
-           
-            
-# default rule        
-all: test-logged
+        
+        
+# default rule  
+all: tests-logged
 
 #
@@ -12 +12 @@
 LOG    = $(OUTDIR)/$(1)-$(TS).log
 CC     = gcc
+LDFLAGS=
 CFLAGS = -O -D_GNU_SOURCE -std=gnu99 -DOBJPFX=\"$(OUTDIR)/\"
 ifeq ($(shell uname -m),amd64)
@@ -24 +25 @@
 #
 ifeq ($(TARGET),)
-TARGET     := bsd
+TARGET     := innoteklibc
 endif
 
 ifeq ($(TARGET),glibc)
-SKIPPED    := 
-EXCEPTIONS := 
+SKIPPED    :=
+EXPECTED   :=
 _TARGET_OK := ok
 CFLAGS     += \
@@ -44 +45 @@
 
 ifeq ($(TARGET),innoteklibc)
-SKIPPED    := 
-EXCEPTIONS := 
+SKIPPED    := \
+        \
+        string/test-ffs.c \
+        string/test-stpncpy.c \
+        string/tst-bswap.c \
+        string/tst-strfry.c \
+        \
+        time/tst_wcsftime.c \
+        time/tst-ftime_l.c \
+        time/tst-getdate.c \
+        \
+        timezone/test-tz.c \
+        timezone/tst-timezone.c \
+        \
+        wcsmbs/tst-wcpncpy.c \
+        wcsmbs/tst-wcsnlen.c \
+
+EXPECTED   := \
+        wcsmbs/tst-mbrtowc.c \
+        wcsmbs/tst-wcrtomb.c \
+        time/tst-posixtz.c
+        
+CFLAGS     += -Zomf -g \
+        -DHAVE_STRNLEN \
+        -DHAVE_MEMPCPY
+LDFLAGS    += -Zstack 512
 _TARGET_OK := ok
 endif
@@ -72 +97 @@
         string/tst-strfry.c
 EXCEPTIONS := \
-        catgets/test-gencat.c 
+        catgets/test-gencat.c
 _TARGET_OK := ok
 CFLAGS     += -I sysdeps/unix/bsd -D__BSD__
@@ -85 +110 @@
         @echo TS=$(TS)
 
-       
+
 #
 # The test.
@@ -135 +160 @@
 
 GRP := \
-        grp/testgrp.c 
+        grp/testgrp.c
 #       grp/tst_fgetgrent.c
         
@@ -213 +238 @@
         libio/tst_wprintf2.c \
         libio/tst_wscanf.c
-          
+        
 libio/tst-widetext.c_INPUT = libio/tst-widetext.input
 libio/tst_getwc.c_INPUT = libio/tst_getwc.input
@@ -240 +265 @@
         malloc/tst-valloc.c
 #        malloc/tst-mtrace.c
-#        malloc/tst-mtrace.sh 
+#        malloc/tst-mtrace.sh
 
 MATH := \
@@ -260 +285 @@
         math/test-tgmath.c \
         math/tst-definitions.c
-#        math/atest-exp2.c 
-#        math/atest-sincos.c 
-#         math/atest-exp.c 
+#        math/atest-exp2.c
+#        math/atest-sincos.c
+#         math/atest-exp.c
 #         math/gen-libm-test.pl
 $(foreach t,$(MATH),$(eval $(t)_LDFLAGS := -lm))
@@ -369 +394 @@
 #        posix/tst-sysconf.c - too new?
 # todo:
-#        posix/wordexp-test.c 
-#        posix/wordexp-tst.sh 
-#        posix/globtest.c 
-#        posix/globtest.sh 
-#        posix/tst-getconf.sh 
+#        posix/wordexp-test.c
+#        posix/wordexp-tst.sh
+#        posix/globtest.c
+#        posix/globtest.sh
+#        posix/tst-getconf.sh
 
 posix/tst-fnmatch.c_INPUT = posix/tst-fnmatch.input
@@ -387 +412 @@
 posix/bug-glob1.c_ARGS = "$(OBJDIR)/posix/"
 posix/tst-execvp3.c_ARGS = --test-dir="$(OBJDIR)/posix/"
-         
+        
 
 PWD := \
@@ -444 +469 @@
 stdio-common/tstgetln.c_INPUT = stdio-common/tstgetln.input
 stdio-common/tstscanf.c_INPUT = stdio-common/tstscanf.input
-#        stdio-common/tst-printf.c 
-#        stdio-common/tst-printf.sh 
-#       stdio-common/tst-unbputc.c 
-#        stdio-common/tst-unbputc.sh 
+#        stdio-common/tst-printf.c
+#        stdio-common/tst-printf.sh
+#       stdio-common/tst-unbputc.c
+#        stdio-common/tst-unbputc.sh
 
 STDLIB := \
@@ -474 +499 @@
         stdlib/testdiv.c
 # todo: 
-#       stdlib/tst-fmtmsg.c 
+#       stdlib/tst-fmtmsg.c
 #       stdlib/tst-fmtmsg.sh
 #       stdlib/tst-putenvmod.c
@@ -611 +636 @@
 #
 # Generate test rules
-#  
+#
 _TESTS :=
 
@@ -617 +642 @@
 define def_simple
 
-$(OUTDIR)/$2.exe: $1 $(OUTDIR)/$(dir $1).dir_created $($(1)_DEPS) 
-        @echo "* COMPILING: $1"
-        @$$(CC) $$(CFLAGS) -o $$@ $($(1)_CFLAGS) $($(1)_LDFLAGS)  $$< || (echo "$$(CC) $$(CFLAGS) -o $$@ $$<" && exit 1)
-        
-$(OUTDIR)/$2.result: $(OUTDIR)/$2.exe 
-        @echo "* TESTING  : $1"
-        @if LC_ALL=C $($1_ENVS) $$< $($1_ARGS) $(if $($(1)_INPUT), < $($(1)_INPUT),) ; then echo OK > $$@; else echo FAILURE > $$@; fi
-        @echo "* RESULT   : $1 - `cat $$@`"
+$(OUTDIR)/$2.result: $1 $(OUTDIR)/$(dir $1).dir_created $($(1)_DEPS)
+        @echo "########## $1"; \
+        echo  "##  BUILDING: $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
+        if $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<; then \
+                echo "##  RUNNING : LC_ALL=C $($1_ENVS) $(OUTDIR)/$2.exe $($1_ARGS) $(if $($(1)_INPUT), < $($(1)_INPUT),)"; \
+                if LC_ALL=C $($1_ENVS) $(OUTDIR)/$2.exe $($1_ARGS) $(if $($(1)_INPUT), < $($(1)_INPUT),); then\
+                        echo OK > $$@; \
+                        printf "########## %-26s - SUCCESS\n" "$1"; \
+                else \
+                        echo "##  rc=$$$$?"; \
+                        printf "########## %-26s - $(if $(filter $1,$(EXPECTED)),EXPECTED FAILURE,FAILURE)\n" "$1"; \
+                        echo "$(if $(filter $1,$(EXPECTED)),EXPECTED,FAILURE)" > $$@; \
+                fi \
+        else \
+                echo "##  rc=$$$$? "; \
+                echo "##  $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
+                printf "########## %-26s - BUILD FAILURE\n" "$1";  \
+                echo "FAILURE - $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<" > $$@; \
+        fi
+        
+$2: $(OUTDIR)/$2.result
+        @
         
 _TESTS += $(OUTDIR)/$2.result
@@ -633 +672 @@
 define def_skipped
 $(OUTDIR)/$2.result:
-        @echo "* SKIPPING : $1"
-        @echo "SKIPPED" > $$@
+        @printf "########## %-26s - SKIPPED\n" "$1"; \
+        echo "SKIPPED" > $$@
         
 _TESTS += $(OUTDIR)/$2.result
@@ -656 +695 @@
         @echo " SUCCESS : `cat /dev/null $$^ | grep OK | wc -l`"
         @echo " SKIPPED : `cat /dev/null $$^ | grep SKIPPED | wc -l`"
+        @echo " EXPECTED: `cat /dev/null $$^ | grep EXPECTED | wc -l`"
         @echo " FAILURES: `cat /dev/null $$^ | grep FAILURE | wc -l`"
 
@@ -664 +704 @@
 
 
-#       
-# generate directory rules               
+#
+# generate directory rules              
 #
 define def_dir
 $1.dir_created:
-        mkdir -p $1
-        echo > $$@
+        @mkdir -p $1
+        @echo > $$@
 endef
 
@@ -679 +719 @@
 #
 # All tests (expect the ones in the next sections).
-# 
+#
 tests: $(_TESTS)
         @echo "***************"
         @echo " SUCCESS : `cat /dev/null $^ | grep OK | wc -l`"
         @echo " SKIPPED : `cat /dev/null $^ | grep SKIPPED | wc -l`"
+        @echo " EXPECTED: `cat /dev/null $^ | grep EXPECTED | wc -l`"
         @echo " FAILURES: `cat /dev/null $^ | grep FAILURE | wc -l`"
 

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;

trunk/src/libctests/glibc/sysdeps/i386/i686/hp-timing.h

@@ -27 +27 @@
 #include <stdio-common/_itoa.h>
 #else
+#ifdef __EMX__
+#include <stdlib.h>
+#else
 extern char *_itoa(int, char *, int, int);
-#endif 
+#endif
+#endif
 
 /* The macros defined here use the timestamp counter in i586 and up versions

trunk/src/libctests/glibc/test-skeleton.c

@@ -50 +50 @@
     char q_data[1];
   };
-#endif 
+#endif
 
 /* The test function is normally called `do_test' and it is called
@@ -220 +220 @@
 #if 0 /* bird */
   mallopt (M_PERTURB, 42);
-#endif 
+#endif
 
 #ifdef STDOUT_UNBUFFERED
@@ -321 +321 @@
                                        data_limit.rlim_max);
           if (setrlimit (RLIMIT_DATA, &data_limit) < 0)
+#ifndef __EMX__
             perror ("setrlimit: RLIMIT_DATA");
+#else
+            ;
+#endif
         }
       else

trunk/src/libctests/glibc/time/tst-strptime.c

@@ -47 +47 @@
   { "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p",
     6, 0, 0, 1 },
+#ifndef __EMX__ /* locale mismatch */
   { "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
   { "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
+#endif
 };
 

trunk/src/libctests/glibc/wctype/test_wctype.c

@@ -21 +21 @@
 #include <stdlib.h>
 #include <wctype.h>
+#include <locale.h>
 
-int
-main (int argc, char *argv[])
+int do_tests()
 {
   int result = 0;
@@ -49 +49 @@
 #define TEST(test) \
       do                                                                      \
-        {                                                                     \
-          if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0))       \
-            {                                                                 \
-              printf ("`iswctype' class `%s' test "                           \
-                      "for character \\%o failed\n", #test, ch);              \
-              result = 1;                                                     \
-            }                                                                 \
-          if ((is##test (ch) == 0) != (isw##test (ch) == 0))                  \
-            {                                                                 \
-              printf ("`isw%s' test for character \\%o failed\n",             \
-                      #test, ch);                                             \
-              result = 1;                                                     \
-            }                                                                 \
-         }                                                                    \
+        {                                                                     \
+          if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0))       \
+            {                                                                 \
+              printf ("`iswctype' class `%s' test "                           \
+                      "for character \\%o failed\n", #test, ch);              \
+              result = 1;                                                     \
+            }                                                                 \
+          if ((is##test (ch) == 0) != (isw##test (ch) == 0))                  \
+            {                                                                 \
+              printf ("`isw%s' test for character \\%o failed\n",             \
+                      #test, ch);                                             \
+              result = 1;                                                     \
+            }                                                                 \
+         }                                                                    \
       while (0)
 
@@ -77 +77 @@
       TEST (xdigit);
     }
+  return result;
+}
 
+int
+main (int argc, char *argv[])
+{
+  int result = do_tests();
+  /* bird: test switching back and forth makes any difference. */
+  setlocale (LC_CTYPE, "en_US");
+  setlocale (LC_CTYPE, "en_US.UTF-8");
+  setlocale (LC_CTYPE, "en_US.UTF8");
+  setlocale (LC_CTYPE, "de_DE");
+  setlocale (LC_CTYPE, "de_DE.UTF-8");
+  setlocale (LC_CTYPE, "no_NO");
+  if (!setlocale (LC_CTYPE, "C"))
+    {
+      puts ("setlocale(LC_CTYPE, C) failed!");
+      result |= 1;
+    }
+  result |= do_tests();
   if (result == 0)
     puts ("All test successful!");