* inet/test-ifaddrs.c: Use test-skeleton.

	* inet/test_ifindex.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a20c174ad255efdf1899ddb192159f9127c787ea..614cf51516f128b3d1c58f6569e3451faf2b6a32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-19  Ulrich Drepper  <drepper@redhat.com>
 
+       * inet/test-ifaddrs.c: Use test-skeleton.
+       * inet/test_ifindex.c: Likewise.
+
        * elf/dl-lookup.c (add_dependency): Always search l_initfini if
        the list exists.
 

diff --git a/inet/test-ifaddrs.c b/inet/test-ifaddrs.c
index 7efca25337b2e245998e9633e0ae7ef38141e650..0d30d05b646036ed03c7c2ddfb1fdb09744a453f 100644 (file)
--- a/inet/test-ifaddrs.c
+++ b/inet/test-ifaddrs.c
@@ -1,5 +1,5 @@
 /* Test listing of network interface addresses.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -62,8 +62,8 @@ addr_string (struct sockaddr *sa, char *buf, size_t size)
 }
 
 
-int
-main (void)
+static int
+do_test (void)
 {
   struct ifaddrs *ifaces, *ifa;
 
@@ -95,3 +95,6 @@ Name           Flags   Address         Netmask         Broadcast/Destination");
 
   return failures ? 1 : 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

diff --git a/inet/test_ifindex.c b/inet/test_ifindex.c
index 9e081233beef3f22cdcccd4cbca0d8057d84583e..2920494521c664ff1f0171ffe2993d56f6a935b8 100644 (file)
--- a/inet/test_ifindex.c
+++ b/inet/test_ifindex.c
@@ -1,5 +1,5 @@
 /* Test interface name <-> index conversions.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <Philip.Blundell@pobox.com>.
 
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <net/if.h>
 
-int
-main (void)
+static int
+do_test (void)
 {
   int failures = 0;
   struct if_nameindex *idx = if_nameindex (), *p;
@@ -63,3 +63,6 @@ main (void)
   if_freenameindex (idx);
   return failures ? 1 : 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"