aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-19 17:45:59 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-19 17:45:59 +0000
commitc9738df4bc0d11e9796365fc4a9ef74198e8c1ca (patch)
treee442e949258ba0e1dcba7d52b3f6bcb2a0faa8ec
parentf7e39466cac0c631b1b7e73e1d76e3e280719947 (diff)
downloadglibc-c9738df4bc0d11e9796365fc4a9ef74198e8c1ca.zip
glibc-c9738df4bc0d11e9796365fc4a9ef74198e8c1ca.tar.gz
glibc-c9738df4bc0d11e9796365fc4a9ef74198e8c1ca.tar.bz2
* inet/test-ifaddrs.c: Use test-skeleton.cvs/fedora-glibc-20050319T1907
* inet/test_ifindex.c: Likewise.
-rw-r--r--ChangeLog3
-rw-r--r--inet/test-ifaddrs.c9
-rw-r--r--inet/test_ifindex.c9
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a20c174..614cf51 100644
--- 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 7efca25..0d30d05 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 9e08123..2920494 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 <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"