Changeset 2116

Timestamp:

Jun 30, 2005, 5:16:59 AM (20 years ago)

Author:

bird

Message:

...

Location:

trunk/src/libctests/glibc

Files:

• Makefile (modified) (4 diffs, 1 prop)
• posix/bug-glob2.c (modified) (4 diffs, 1 prop)
• posix/bug-regex1.c (modified) (1 diff, 1 prop)
• resolv/tst-leaks.c (modified) (2 diffs, 1 prop)
• resolv/tst-leaks2.c (modified) (2 diffs, 1 prop)

trunk/src/libctests/glibc/Makefile

@@ -52 +52 @@
 ifeq ($(TARGET),innoteklibc)
 SKIPPED    := \
+        posix/bug-ga1.c \
+        posix/bug-ga2.c \
+        posix/test-vfork.c \
+        \
+        pwd/tst-getpw.c \
+        \
         stdio-common/tst-cookie.c \
         stdio-common/tst-fmemopen.c \
@@ -88 +94 @@
         time/tst-posixtz.c \
         time/tst-strftime.c \
-        stdlib/tst-bsearch.c \
-        stdlib/tst-qsort.c \
         stdlib/tst-putenv.c \
         stdio-common/test-popen.c \
         stdio-common/test-vfprintf.c \
         stdio-common/tst-fphex.c \
-    stdio-common/tstscanf.c
+    stdio-common/tstscanf.c \
+        resolv/tst-aton.c \
+        posix/bug-glob1.c \
+        posix/bug-glob2.c
         
 # NOTES:        
@@ -448 +455 @@
 posix/tst-pcre.c_ARGS = posix/PCRE.tests
 posix/tst-boost.c_ARGS = posix/BOOST.tests
-posix/bug-glob1.c_ARGS = "$(OBJDIR)/posix/"
-posix/tst-execvp3.c_ARGS = --test-dir="$(OBJDIR)/posix/"
+posix/bug-glob1.c_ARGS = "."
+posix/tst-execvp3.c_ARGS = --test-dir="."
         
 
@@ -457 +464 @@
 RESOLV := \
         resolv/tst-aton.c \
-        resolv/tst-leaks.c
+        resolv/tst-leaks.c \
+        resolv/tst-leaks2.c
+ifeq ($(TARGET),glibc)
 resolv/tst-leaks.c_LDFLAGS = -lresolv
+resolv/tst-leaks2.c_LDFLAGS = -lresolv
+endif
         
 RT :=  # todo

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>
@@ -268 +270 @@
 do_test (void)
 {
+#ifdef HAVE_MCHECK_H
   mtrace ();
+#endif
 
   glob_t gl;
@@ -278 +282 @@
     {
       puts ("glob did not fail with GLOB_ABORTED");
-      exit (EXIT_FAILURE); 
+      exit (EXIT_FAILURE);
     }
 
@@ -290 +294 @@
     {
       puts ("glob did not fail with GLOB_NOMATCH");
-      exit (EXIT_FAILURE); 
+      exit (EXIT_FAILURE);
     }
 
   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/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.  */
@@ -35 +37 @@
   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>
@@ -27 +29 @@
 do_test (void)
 {
+#ifdef HAVE_MCHECK_H
   mtrace ();
+#endif
   for (int i = 0; i < 20; ++i)
     {