From c9738df4bc0d11e9796365fc4a9ef74198e8c1ca Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 19 Mar 2005 17:45:59 +0000 Subject: [PATCH] * inet/test-ifaddrs.c: Use test-skeleton. * inet/test_ifindex.c: Likewise. --- ChangeLog | 3 +++ inet/test-ifaddrs.c | 9 ++++++--- inet/test_ifindex.c | 9 ++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a20c174ad2..614cf51516 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-03-19 Ulrich Drepper + * 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 7efca25337..0d30d05b64 100644 --- 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 9e081233be..2920494521 100644 --- 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 . @@ -24,8 +24,8 @@ #include #include -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"