Changeset 2135

Timestamp:

Jul 1, 2005, 6:20:01 AM (20 years ago)

Author:

bird

Message:

libc adjustments / config.

Location:

trunk/src/libctests/glibc

Files:

• Makefile (modified) (6 diffs, 1 prop)
• posix/bug-glob2.c (modified) (3 diffs, 1 prop)
• posix/bug-regex1.c (modified) (1 diff, 1 prop)
• posix/runptests.c (modified) (2 diffs, 1 prop)
• posix/tst-chmod.c (modified) (1 diff, 1 prop)
• posix/tst-dir.c (modified) (1 diff, 1 prop)
• posix/tst-exec.c (modified) (2 diffs, 1 prop)
• posix/tst-execvp3.c (modified) (1 diff, 1 prop)
• posix/tst-fnmatch.c (modified) (4 diffs, 1 prop)
• resolv/tst-leaks.c (modified) (2 diffs, 1 prop)
• resolv/tst-leaks2.c (modified) (2 diffs, 1 prop)
• stdio-common/test-vfprintf.c (modified) (2 diffs, 1 prop)
• stdio-common/tstgetln.c (modified) (1 diff, 1 prop)
• sysdeps/os2 (added)
• sysdeps/os2/mcheck.h (added)

trunk/src/libctests/glibc/Makefile

@@ -32 +32 @@
 EXPECTED   :=
 _TARGET_OK := ok
-CFLAGS     += \
-    -DHAVE_MCHECK_H \
+CFLAGS     += -D__GLIBC__ \
         -DHAVE___STRTOD_INTERNAL \
         -DHAVE_ASPRINTF \
@@ -54 +53 @@
         posix/bug-ga1.c \
         posix/bug-ga2.c \
+        posix/bug-regex1.c \
+        posix/bug-regex10.c \
+        posix/bug-regex13.c \
+        posix/bug-regex14.c \
+        posix/bug-regex16.c \
+        posix/bug-regex17.c \
+        posix/bug-regex19.c \
+        posix/bug-regex20.c \
+        posix/bug-regex22.c \
+        posix/bug-regex4.c \
+        posix/bug-regex7.c \
+        posix/bug-regex8.c \
+        posix/runtests.c \
         posix/test-vfork.c \
+        posix/tst-boost.c \
+        posix/tst-execl2.c \
+        posix/tst-execle2.c \
+        posix/tst-execlp2.c \
+        posix/tst-execv2.c \
+        posix/tst-execve2.c \
+        posix/tst-execvp2.c \
+        posix/tst-execvp3.c \
+        posix/tst-getaddrinfo.c \
+        posix/tst-getaddrinfo2.c \
+        posix/tst-gnuglob.c \
+        posix/tst-mmap.c \
+        posix/tst-preadwrite64.c \
+        posix/tst-rxspencer.c \
+        posix/tst-truncate64.c \
+        posix/tst-vfork1.c \
+    posix/tst-vfork2.c \
         \
         pwd/tst-getpw.c \
@@ -66 +95 @@
         stdio-common/tst-printfsz.c \
         stdio-common/tst-swprintf.c \
-        stdio-common/tstgetln.c \
         \
     stdlib/test-a64l.c \
@@ -101 +129 @@
         resolv/tst-aton.c \
         posix/bug-glob1.c \
-        posix/bug-glob2.c
+        posix/bug-glob2.c \
+        posix/bug-regex11.c \
+        posix/bug-regex15.c \
+        posix/bug-regex18.c \
+        posix/bug-regex9.c \
+        posix/testfnm.c \
+        posix/tst-chmod.c \
+        posix/tst-dir.c \
+        posix/tst-fnmatch.c     \
+        posix/tst-pcre.c
         
 # NOTES:        
@@ -108 +145 @@
 # stdio-common/tst-sscanf.c:            Is doing some thousand separator and internationalization stuff which we don't implement.
 # stdio-common/tstscanf.c:                      two cases of sscan working in three different ways depending on glibc, bsd or libc. cool!
-        
-CFLAGS     += -Zomf -g \
+# posix/runtests.c:                                     This really needs looking at on BSD.
+# posix/testfnm.c:                                      This looks bad!
+# posix/tst-fnmatch.c:                          This too!
+        
+CFLAGS     += -Zomf -g -I sysdeps/os2 \
         -DHAVE_STRNLEN \
-        -DHAVE_MEMPCPY
+        -DHAVE_MEMPCPY \
+        -DHAVE_ASPRINTF \
+        -DHAVE_GETLINE \
+        -DHAVE_STRCHRNUL \
+        -DHAVE_RAWMEMCHR \
+        -DHAVE_MEMRCHR
 LDFLAGS    += -Zstack 512
 _TARGET_OK := ok
+
+posix/runptests.c_ARGS = 15             # expect 15 errors
 endif
 
@@ -448 +495 @@
         
 posix/tstgetopt.c_ARGS = -a -b -cfoobar --required foobar --optional=bazbug --none random --col --color --colour
-posix/tst-exec.c_ARGS = -- $(OUTDIR)/posix/tst-exec.exe
-posix/tst-spawn.c_ARGS = -- $(OUTDIR)/posix/tst-spawn.exe
-posix/tst-dir.c_ARGS = `pwd` `cd $(OUTDIR)/$(posix); pwd` `cd $(OUTDIR)/; pwd` $(OUTDIR)/tst-dir.exe
-posix/tst-chmod.c_ARGS = `cd posix/; pwd`
+posix/tst-exec.c_ARGS = -- ./tst-exec.exe --direct --direct --direct
+posix/tst-spawn.c_ARGS = -- ./tst-spawn.exe --direct --direct --direct
+posix/tst-dir.c_ARGS = `pwd` `pwd`/$(OUTDIR)/posix `pwd`/$(OUTDIR) `pwd`/$(OUTDIR)/tst-dir.exe
+posix/tst-chmod.c_ARGS = `pwd`/posix
 posix/tst-rxspencer.c_ARGS = --utf8 posix/rxspencer/tests
-posix/tst-pcre.c_ARGS = posix/PCRE.tests
-posix/tst-boost.c_ARGS = posix/BOOST.tests
+posix/tst-pcre.c_ARGS = $(CURDIR)/posix/PCRE.tests
+posix/tst-boost.c_ARGS = $(CURDIR)/posix/BOOST.tests
 posix/bug-glob1.c_ARGS = "."
 posix/tst-execvp3.c_ARGS = --test-dir="."

trunk/src/libctests/glibc/posix/bug-glob2.c

@@ -23 +23 @@
 #include <dirent.h>
 #include <glob.h>
-#ifdef HAVE_MCHECK_H
 #include <mcheck.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
@@ -270 +268 @@
 do_test (void)
 {
-#ifdef HAVE_MCHECK_H
   mtrace ();
-#endif
 
   glob_t gl;
@@ -299 +295 @@
   globfree (&gl);
 
-#ifdef HAVE_MCHECK_H
   muntrace ();
-#endif
 
   return 0;

trunk/src/libctests/glibc/posix/bug-regex1.c

@@ -18 +18 @@
 
   setlocale (LC_ALL, "de_DE.ISO-8859-1");
-#ifdef HAVE_FWIDE
   fwide (stdout, -1);
 

trunk/src/libctests/glibc/posix/runptests.c

@@ -43 +43 @@
   size_t cnt;
   int errors = 0;
+  int errors_expected = argc > 1 ? atoi(argv[argc - 1]) : 0;
 
   for (cnt = 0; cnt < sizeof (tests) / sizeof (tests[0]); ++cnt)
@@ -118 +119 @@
       }
 
-  printf ("\n%Zu tests, %d errors\n", cnt, errors);
+  printf ("\n%Zu tests, %d errors, expected %d\n", cnt, errors, errors_expected);
 
-  return errors != 0;
+  return errors != errors_expected;
 }

trunk/src/libctests/glibc/posix/tst-chmod.c

@@ -29 +29 @@
 #include <unistd.h>
 #include <sys/stat.h>
+
+#ifndef HAVE_64BIT_FILEIO_TYPES
+#define stat64 stat
+#define fstat64 fstat
+#endif
 
 

trunk/src/libctests/glibc/posix/tst-dir.c

@@ -28 +28 @@
 #include <unistd.h>
 #include <sys/stat.h>
+
+#ifndef HAVE_64BIT_FILEIO_TYPES
+#define stat64 stat
+#define fstat64 fstat
+#define dirent64 dirent
+#define readdir64_r readdir_r
+#define readdir64 readdir
+#endif
+#ifdef __EMX__
+#warning fchdir still not implemented?
+#define fchdir(fd) (-1)
+#endif
 
 

trunk/src/libctests/glibc/posix/tst-exec.c

@@ -142 +142 @@
     {
       if (argc != 4)
-        error (EXIT_FAILURE, 0, "wrong number of arguments (%d)", argc);
+        error (EXIT_FAILURE, 0, "wrong number of arguments (%d) argv[0]=%s argv[1]=%s argv[2]=%s argv[3]=%s argv[4]=%s argv[5]=%s argv[6]=%s argv[7]=%s argv[8]=%s",
+               argc, argc > 0 ? argv[0] : "<null>", argc > 1 ? argv[1] : "<null>", argc > 2 ? argv[2] : "<null>", argc > 3 ? argv[3] : "<null>",
+               argc > 4 ? argv[4] : "<null>", argc > 5 ? argv[5] : "<null>", argc > 6 ? argv[6] : "<null>", argc > 7 ? argv[7] : "<null>",
+               argc > 8 ? argv[8] : "<null>");
 
       return handle_restart (argv[1], argv[2], argv[3]);
@@ -148 +151 @@
 
   if (argc != 5)
-    error (EXIT_FAILURE, 0, "wrong number of arguments (%d)", argc);
+    error (EXIT_FAILURE, 0, "wrong number of arguments (%d) argv[0]=%s argv[1]=%s argv[2]=%s argv[3]=%s argv[4]=%s",
+           argc, argc > 0 ? argv[0] : "<null>", argc > 1 ? argv[1] : "<null>", argc > 2 ? argv[2] : "<null>",
+           argc > 3 ? argv[3] : "<null>", argc > 4 ? argv[4] : "<null>");
 
   /* Prepare the test.  We are creating two files: one which file descriptor

trunk/src/libctests/glibc/posix/tst-execvp3.c

@@ -20 +20 @@
 {
   int fd = create_temp_file ("testscript", &fname);
+#if 0
   dprintf (fd, "echo foo\n");
   fchmod (fd, 0700);
   close (fd);
+#else
+  FILE *pf = fdopen (fd, "w+");
+  fprintf (pf, "echo foo\n");
+  fflush (pf);
+  fchmod (fd, 0700);
+  fclose (pf);
+#endif
 }
 

trunk/src/libctests/glibc/posix/tst-fnmatch.c

@@ -264 +264 @@
           len = 8;
         }
+#ifdef FNM_EXTMATCH
       else if (strncasecmp (str, "EXTMATCH", 8) == 0
                && (str[8] == '|' || str[8] == '\0'))
@@ -270 +271 @@
           len = 8;
         }
+#else
+#warning "FNM_EXTMATCH isn't defined!"
+#endif
       else
         return -1;
@@ -322 +326 @@
       first = 0;
     }
+#ifdef FNM_EXTMATCH
   if (flags & FNM_EXTMATCH)
     {
@@ -329 +334 @@
       first = 0;
     }
+#else
+#warning "FNM_EXTMATCH isn't defined!"
+#endif
   if (cp == buf)
     *cp++ = '0';

trunk/src/libctests/glibc/resolv/tst-leaks.c

@@ -21 +21 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
-#ifdef HAVE_MCHECK_H
 #include <mcheck.h>
-#endif
 
 /* Prototype for our test function.  */
@@ -37 +35 @@
   unsigned char buf[256];
 
-#ifdef HAVE_MCHECK_H
   mtrace();
-#endif
 
   /* This will allocate some memory, which should be automatically

trunk/src/libctests/glibc/resolv/tst-leaks2.c

@@ -20 +20 @@
 #undef gethostbyname
 
-#ifdef HAVE_MCHECK_H
 #include <mcheck.h>
-#endif
 #include <netdb.h>
 #include <resolv.h>
@@ -29 +27 @@
 do_test (void)
 {
-#ifdef HAVE_MCHECK_H
   mtrace ();
-#endif
   for (int i = 0; i < 20; ++i)
     {

trunk/src/libctests/glibc/stdio-common/test-vfprintf.c

@@ -20 +20 @@
 
 #include <locale.h>
-#ifdef HAVE_MCHECK_H
 #include <mcheck.h>
-#endif
 #include <stdint.h>
 #include <stdio.h>
@@ -48 +46 @@
   int fd;
 
-#ifdef HAVE_MCHECK_H
   mtrace ();
-#endif
 
   strcpy (buf, "/tmp/test-vfprintfXXXXXX");

trunk/src/libctests/glibc/stdio-common/tstgetln.c

@@ -19 +19 @@
 
 #include <stdio.h>
+#ifdef __GLIBC__
 #undef ssize_t
 #define ssize_t _IO_ssize_t
+#endif
 
 int