Changeset 2135 for trunk/src/libctests/glibc/posix

Timestamp:

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

Author:

bird

Message:

libc adjustments / config.

Location:

trunk/src/libctests/glibc/posix

Files:

• bug-glob2.c (modified) (3 diffs, 1 prop)
• bug-regex1.c (modified) (1 diff, 1 prop)
• runptests.c (modified) (2 diffs, 1 prop)
• tst-chmod.c (modified) (1 diff, 1 prop)
• tst-dir.c (modified) (1 diff, 1 prop)
• tst-exec.c (modified) (2 diffs, 1 prop)
• tst-execvp3.c (modified) (1 diff, 1 prop)
• tst-fnmatch.c (modified) (4 diffs, 1 prop)

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';