Changeset 2137 for trunk

Timestamp:

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

Author:

bird

Message:

More libc.

Location:

trunk/src/libctests/glibc

Files:

• Makefile (modified) (3 diffs, 1 prop)
• misc/tst-tsearch.c (modified) (1 diff, 1 prop)
• nss/test-netdb.c (modified) (5 diffs, 1 prop)

trunk/src/libctests/glibc/Makefile

@@ -46 +46 @@
         -DHAVE_NEWLOCALE \
         -DHAVE_64BIT_FILEIO_TYPES \
-        -DHAVE_SWPRINTF
+        -DHAVE_SWPRINTF \
+        -DHAVE_RPC_NETDB_H
 endif
 
 ifeq ($(TARGET),innoteklibc)
 SKIPPED    := \
+        \
+        misc/tst-efgcvt.c \
+        misc/tst-mntent.c \
+        \
+        nss/bug-erange.c \
+        \
         posix/bug-ga1.c \
         posix/bug-ga2.c \
@@ -138 +145 @@
         posix/tst-dir.c \
         posix/tst-fnmatch.c     \
-        posix/tst-pcre.c
+        posix/tst-pcre.c \
+        misc/tst-tsearch.c
         
 # NOTES:        
@@ -148 +156 @@
 # posix/testfnm.c:                                      This looks bad!
 # posix/tst-fnmatch.c:                          This too!
+# misc/tst-tsearch.c:                           This really needs looking at on BSD.
         
 CFLAGS     += -Zomf -g -I sysdeps/os2 \

trunk/src/libctests/glibc/misc/tst-tsearch.c

@@ -151 +151 @@
 #endif
     {
-      fputs ("Depth too large during tree walk.\n", stdout);
+      printf ("Depth too large during tree walk. max_depth=%d expected_count=%d (%d)\n",
+             max_depth, expected_count, log (expected_count) * 2 + 2);
       error = 1;
     }

trunk/src/libctests/glibc/nss/test-netdb.c

@@ -32 +32 @@
 
 #include <netdb.h>
+#ifdef HAVE_RPC_NETDB_H
 #include <rpc/netdb.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -302 +304 @@
 
 
+#ifdef HAVE_RPC_NETDB_H
 static void
 output_rpcent (const char *call, struct rpcent *rptr)
@@ -338 +341 @@
   endrpcent ();
 }
-
+#endif
+
+#if 0  /* not very useful when you don't have this function... */
 /* Override /etc/nsswitch.conf for this program.  This is mainly
    useful for developers. */
@@ -356 +361 @@
   __nss_configure_lookup ("services", dbname);
 }
-
+#endif
 
 int
@@ -368 +373 @@
   test_network ();
   test_protocols ();
+#ifdef HAVE_RPC_NETDB_H
   test_rpc ();
+#endif
   test_services ();