MFC r290563,r290868,r291038:

r290563:

Integrate tools/regression/lib/libc/net into the FreeBSD test suite
as lib/libc/tests/net

Also, fix eui64_aton_test:test_str(..). The test was comparing the result
of eui64_aton to a pointer of the expected result.

Sponsored by: EMC / Isilon Storage Division

r290868:

Fix -Wformat issues

Reported by: gcc
Sponsored by: EMC / Isilon Storage Division

r291038:

Do not print out errno if the call succeeded unexpectedly; this was a mistake
made in r290868

Reported by: jilles
Sponsored by: EMC / Isilon Storage Division

10 files changed, 277 insertions, 318 deletions

diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile
index eb199f0..b8f6d97 100644
--- a/lib/libc/tests/net/Makefile
+++ b/lib/libc/tests/net/Makefile
@@ -1,24 +1,25 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 TESTSDIR=	${TESTSBASE}/lib/libc/net
 
-BINDIR=		${TESTSDIR}
+ATF_TESTS_C+=	ether_test
+ATF_TESTS_C+=	eui64_aton_test
+ATF_TESTS_C+=	eui64_ntoa_test
 
-NETBSD_ATF_TESTS_C=	getprotoent_test
-NETBSD_ATF_TESTS_C+=	ether_aton_test
+CFLAGS+=	-I${.CURDIR}
 
-SRCS.t_ether_aton=	aton_ether_subr.c t_ether_aton.c
+NETBSD_ATF_TESTS_C+=	getprotoent_test
+NETBSD_ATF_TESTS_C+=	ether_aton_test
 
-aton_ether_subr.c: gen_ether_subr ${.CURDIR:H:H:H:H}/sys/net/if_ethersubr.c
-	${HOST_SH} ${.ALLSRC} ${.TARGET}
+SRCS.ether_aton_test=	aton_ether_subr.c t_ether_aton.c
 
 # TODO: hostent_test
 NETBSD_ATF_TESTS_SH=	nsdispatch_test
 NETBSD_ATF_TESTS_SH+=	protoent_test
 NETBSD_ATF_TESTS_SH+=	servent_test
 
+BINDIR=		${TESTSDIR}
+
 PROGS=		h_nsd_recurse
 PROGS+=		h_protoent
 PROGS+=		h_servent
@@ -28,12 +29,14 @@ DPADD.h_nsd_recurse+=	${LIBPTHREAD}
 LDADD.h_nsd_recurse+=	-lpthread
 
 CLEANFILES+=	aton_ether_subr.c
+aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c
+	${HOST_SH} ${.ALLSRC} ${.TARGET}
 
 .include "../Makefile.netbsd-tests"
 
 # TODO: the testcases needs to be ported to FreeBSD
 #TESTS_SUBDIRS=	getaddrinfo
-FILES=	hosts
+FILES+=	hosts
 FILES+=	resolv.conf
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/net/ether_test.c b/lib/libc/tests/net/ether_test.c
new file mode 100644
index 0000000..5b596f0
--- /dev/null
+++ b/lib/libc/tests/net/ether_test.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2007 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+
+#include <net/ethernet.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+static const char *ether_line_string = "01:23:45:67:89:ab ether_line_hostname";
+static const char *ether_line_hostname = "ether_line_hostname";
+static const struct ether_addr	 ether_line_addr = {
+	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
+};
+
+ATF_TC_WITHOUT_HEAD(ether_line);
+ATF_TC_BODY(ether_line, tc)
+{
+	struct ether_addr e;
+	char hostname[256];
+
+	ATF_REQUIRE_MSG(ether_line(ether_line_string, &e, hostname) == 0,
+	    "ether_line failed; errno=%d", errno);
+	ATF_REQUIRE_MSG(bcmp(&e, &ether_line_addr, ETHER_ADDR_LEN) == 0,
+	    "bad address");
+	ATF_REQUIRE_MSG(strcmp(hostname, ether_line_hostname) == 0,
+	    "bad hostname");
+}
+
+static const char *ether_line_bad_1_string = "x";
+
+ATF_TC_WITHOUT_HEAD(ether_line_bad_1);
+ATF_TC_BODY(ether_line_bad_1, tc)
+{
+	struct ether_addr e;
+	char hostname[256];
+
+	ATF_REQUIRE_MSG(ether_line(ether_line_bad_1_string, &e, hostname) != 0,
+	    "ether_line succeeded unexpectedly");
+}
+
+static const char *ether_line_bad_2_string = "x x";
+
+ATF_TC_WITHOUT_HEAD(ether_line_bad_2);
+ATF_TC_BODY(ether_line_bad_2, tc)
+{
+	struct ether_addr e;
+	char hostname[256];
+
+	ATF_REQUIRE_MSG(ether_line(ether_line_bad_2_string, &e, hostname) != 0,
+	    "ether_line succeeded unexpectedly");
+}
+
+static const char *ether_aton_string = "01:23:45:67:89:ab";
+static const struct ether_addr	 ether_aton_addr = {
+	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
+};
+
+ATF_TC_WITHOUT_HEAD(ether_aton_r);
+ATF_TC_BODY(ether_aton_r, tc)
+{
+	struct ether_addr e, *ep;
+
+	ep = ether_aton_r(ether_aton_string, &e);
+
+	ATF_REQUIRE_MSG(ep != NULL, "ether_aton_r failed; errno=%d", errno);
+	ATF_REQUIRE_MSG(ep == &e,
+	    "ether_aton_r returned different pointers; %p != %p", ep, &e);
+}
+
+static const char		*ether_aton_bad_string = "x";
+
+ATF_TC_WITHOUT_HEAD(ether_aton_r_bad);
+ATF_TC_BODY(ether_aton_r_bad, tc)
+{
+	struct ether_addr e, *ep;
+
+	ep = ether_aton_r(ether_aton_bad_string, &e);
+	ATF_REQUIRE_MSG(ep == NULL, "ether_aton_r succeeded unexpectedly");
+}
+
+ATF_TC_WITHOUT_HEAD(ether_aton);
+ATF_TC_BODY(ether_aton, tc)
+{
+	struct ether_addr *ep;
+
+	ep = ether_aton(ether_aton_string);
+	ATF_REQUIRE_MSG(ep != NULL, "ether_aton failed");
+	ATF_REQUIRE_MSG(bcmp(ep, &ether_aton_addr, ETHER_ADDR_LEN) == 0,
+	    "bad address");
+}
+
+ATF_TC_WITHOUT_HEAD(ether_aton_bad);
+ATF_TC_BODY(ether_aton_bad, tc)
+{
+	struct ether_addr *ep;
+
+	ep = ether_aton(ether_aton_bad_string);
+	ATF_REQUIRE_MSG(ep == NULL, "ether_aton succeeded unexpectedly");
+}
+
+static const char *ether_ntoa_string = "01:23:45:67:89:ab";
+static const struct ether_addr	 ether_ntoa_addr = {
+	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
+};
+
+ATF_TC_WITHOUT_HEAD(ether_ntoa_r);
+ATF_TC_BODY(ether_ntoa_r, tc)
+{
+	char buf[256], *cp;
+
+	cp = ether_ntoa_r(&ether_ntoa_addr, buf);
+	ATF_REQUIRE_MSG(cp != NULL, "ether_ntoa_r failed");
+	ATF_REQUIRE_MSG(cp == buf,
+	    "ether_ntoa_r returned a different pointer; %p != %p", cp, buf);
+	ATF_REQUIRE_MSG(strcmp(cp, ether_ntoa_string) == 0,
+	    "strings did not match (`%s` != `%s`)", cp, ether_ntoa_string);
+}
+
+ATF_TC_WITHOUT_HEAD(ether_ntoa);
+ATF_TC_BODY(ether_ntoa, tc)
+{
+	char *cp;
+
+	cp = ether_ntoa(&ether_ntoa_addr);
+	ATF_REQUIRE_MSG(cp != NULL, "ether_ntoa failed");
+	ATF_REQUIRE_MSG(strcmp(cp, ether_ntoa_string) == 0,
+	    "strings did not match (`%s` != `%s`)", cp, ether_ntoa_string);
+}
+
+#if 0
+ATF_TC_WITHOUT_HEAD(ether_ntohost);
+ATF_TC_BODY(ether_ntohost, tc)
+{
+
+}
+
+ATF_TC_WITHOUT_HEAD(ether_hostton);
+ATF_TC_BODY(ether_hostton, tc)
+{
+
+}
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ether_line);
+	ATF_TP_ADD_TC(tp, ether_line_bad_1);
+	ATF_TP_ADD_TC(tp, ether_line_bad_2);
+	ATF_TP_ADD_TC(tp, ether_aton_r);
+	ATF_TP_ADD_TC(tp, ether_aton_r_bad);
+	ATF_TP_ADD_TC(tp, ether_aton);
+	ATF_TP_ADD_TC(tp, ether_aton_bad);
+	ATF_TP_ADD_TC(tp, ether_ntoa_r);
+	ATF_TP_ADD_TC(tp, ether_ntoa);
+#if 0
+	ATF_TP_ADD_TC(tp, ether_ntohost);
+	ATF_TP_ADD_TC(tp, ether_hostton);
+#endif
+
+	return (atf_no_error());
+}
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.c b/lib/libc/tests/net/eui64_aton_test.c
index e10f985..7b97d7f 100644
--- a/tools/regression/lib/libc/net/test-eui64_aton.c
+++ b/lib/libc/tests/net/eui64_aton_test.c
@@ -30,44 +30,75 @@
 
 #include <sys/types.h>
 #include <sys/eui64.h>
+#include <locale.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <atf-c.h>
+
 #include "test-eui64.h"
 
-static int
-test_str( const char *str, const struct eui64 *eui)
+static void
+test_str(const char *str, const struct eui64 *eui)
 {
-	struct eui64	e;
-	char		buf[EUI64_SIZ];
-	static int	test = 0;
-
-	test++;
+	struct eui64 e;
+	char buf[EUI64_SIZ];
+	int rc;
 
-	if (eui64_aton(str, &e) != 0 &&
-	    memcmp(&e, &eui, sizeof(struct eui64)) != 0) {
-		printf("not ok %d - : eui64_aton(%s)\n", test, str);
+	ATF_REQUIRE_MSG(eui64_aton(str, &e) == 0, "eui64_aton failed");
+	rc = memcmp(&e, eui, sizeof(e));
+	if (rc != 0) {
 		eui64_ntoa(&e, buf, sizeof(buf));
-		printf("# got: %s\n", buf);
-		return (0);
-	} else {
-		printf("ok %d - eui64_aton(%s)\n", test, str);
-		return (1);
+		atf_tc_fail(
+		    "eui64_aton(\"%s\", ..) failed; memcmp returned %d. "
+		    "String obtained form eui64_ntoa was: `%s`",
+		    str, rc, buf);
 	}
-
 }
 
-int
-main(int argc, char **argv)
+ATF_TC_WITHOUT_HEAD(id_ascii);
+ATF_TC_BODY(id_ascii, tc)
 {
 
-	printf("1..5\n");
-
 	test_str(test_eui64_id_ascii, &test_eui64_id);
+}
+
+ATF_TC_WITHOUT_HEAD(id_colon_ascii);
+ATF_TC_BODY(id_colon_ascii, tc)
+{
+
 	test_str(test_eui64_id_colon_ascii, &test_eui64_id);
+}
+
+ATF_TC_WITHOUT_HEAD(mac_ascii);
+ATF_TC_BODY(mac_ascii, tc)
+{
+
 	test_str(test_eui64_mac_ascii, &test_eui64_eui48);
+}
+
+ATF_TC_WITHOUT_HEAD(mac_colon_ascii);
+ATF_TC_BODY(mac_colon_ascii, tc)
+{
+
 	test_str(test_eui64_mac_colon_ascii, &test_eui64_eui48);
+}
+
+ATF_TC_WITHOUT_HEAD(hex_ascii);
+ATF_TC_BODY(hex_ascii, tc)
+{
+
 	test_str(test_eui64_hex_ascii, &test_eui64_id);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, id_ascii);
+	ATF_TP_ADD_TC(tp, id_colon_ascii);
+	ATF_TP_ADD_TC(tp, mac_ascii);
+	ATF_TP_ADD_TC(tp, mac_colon_ascii);
+	ATF_TP_ADD_TC(tp, hex_ascii);
 
-	return (0);
+	return (atf_no_error());
 }
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.c b/lib/libc/tests/net/eui64_ntoa_test.c
index f7582f0..4158e7a 100644
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.c
+++ b/lib/libc/tests/net/eui64_ntoa_test.c
@@ -33,22 +33,32 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <atf-c.h>
+
 #include "test-eui64.h"
 
-int
-main(int argc, char **argv)
+static void
+test_str(const char *str, const struct eui64 *eui)
 {
 	char a[EUI64_SIZ];
 
-	printf("1..1\n");
+	ATF_REQUIRE_MSG(eui64_ntoa(&test_eui64_id, a, sizeof(a)) == 0,
+	    "eui64_ntoa failed");
+	ATF_REQUIRE_MSG(strcmp(a, test_eui64_id_ascii) == 0,
+	    "the strings mismatched: `%s` != `%s`", a, test_eui64_id_ascii);
+}
+
+ATF_TC_WITHOUT_HEAD(id_ascii);
+ATF_TC_BODY(id_ascii, tc)
+{
+
+	test_str(test_eui64_id_ascii, &test_eui64_id);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
 
-	if (eui64_ntoa(&test_eui64_id, a, sizeof(a)) == 0 &&
-	    strcmp(a, test_eui64_id_ascii) == 0) {
-		printf("ok 1 - eui64_ntoa\n");
-		return (0);
-	}
-	printf("# a = '%s'\n", a);
+	ATF_TP_ADD_TC(tp, id_ascii);
 
-	printf("not ok 1 - eui64_ntoa\n");
-	return (0);
+	return (atf_no_error());
 }
diff --git a/tools/regression/lib/libc/net/test-eui64.h b/lib/libc/tests/net/test-eui64.h
index ea82a10..ea82a10 100644
--- a/tools/regression/lib/libc/net/test-eui64.h
+++ b/lib/libc/tests/net/test-eui64.h
diff --git a/tools/regression/lib/libc/net/Makefile b/tools/regression/lib/libc/net/Makefile
deleted file mode 100644
index 4f19edf..0000000
--- a/tools/regression/lib/libc/net/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-ether test-eui64_aton test-eui64_ntoa
-CFLAGS+= -g -Wall
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/libc/net/test-ether.c b/tools/regression/lib/libc/net/test-ether.c
deleted file mode 100644
index 7408101..0000000
--- a/tools/regression/lib/libc/net/test-ether.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * Copyright (c) 2007 Robert N. M. Watson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-
-#include <net/ethernet.h>
-
-#include <stdio.h>
-#include <string.h>
-
-static int testnum;
-
-#define	OK()	do {							\
-	printf("ok %d %s\n", testnum, __func__);			\
-	return;								\
-} while (0)
-
-#define	NOTOK(why)	do {						\
-	printf("not ok %d %s # %s\n", testnum, __func__, why);		\
-	return;								\
-} while (0)
-
-#define	TODO()	NOTOK("TODO")
-
-static const char		*ether_line_string =
-				    "01:23:45:67:89:ab ether_line_hostname";
-static const char		*ether_line_hostname = "ether_line_hostname";
-static const struct ether_addr	 ether_line_addr = {
-	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
-};
-
-static void
-test_ether_line(void)
-{
-	struct ether_addr e;
-	char hostname[256];
-
-	testnum++;
-	if (ether_line(ether_line_string, &e, hostname) != 0)
-		NOTOK("returned error");
-	if (bcmp(&e, &ether_line_addr, ETHER_ADDR_LEN) != 0)
-		NOTOK("bad address");
-	if (strcmp(hostname, ether_line_hostname) != 0) {
-		printf("hostname: %s\n", hostname);
-		NOTOK("bad hostname");
-	}
-	OK();
-}
-
-static const char		*ether_line_bad_1_string = "x";
-
-static void
-test_ether_line_bad_1(void)
-{
-	struct ether_addr e;
-	char hostname[256];
-
-	testnum++;
-	if (ether_line(ether_line_bad_1_string, &e, hostname) == 0)
-		NOTOK("returned success");
-	OK();
-}
-
-static const char		*ether_line_bad_2_string = "x x";
-
-static void
-test_ether_line_bad_2(void)
-{
-	struct ether_addr e;
-	char hostname[256];
-
-	testnum++;
-	if (ether_line(ether_line_bad_2_string, &e, hostname) == 0)
-		NOTOK("returned success");
-	OK();
-}
-
-static const char		*ether_aton_string = "01:23:45:67:89:ab";
-static const struct ether_addr	 ether_aton_addr = {
-	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
-};
-
-static void
-test_ether_aton_r(void)
-{
-	struct ether_addr e, *ep;
-
-	testnum++;
-	ep = ether_aton_r(ether_aton_string, &e);
-	if (ep == NULL)
-		NOTOK("returned NULL");
-	if (ep != &e)
-		NOTOK("returned different pointer");
-	if (bcmp(&e, &ether_aton_addr, ETHER_ADDR_LEN) != 0)
-		NOTOK("bad address");
-	OK();
-}
-
-static const char		*ether_aton_bad_string = "x";
-
-static void
-test_ether_aton_r_bad(void)
-{
-	struct ether_addr e, *ep;
-
-	testnum++;
-	ep = ether_aton_r(ether_aton_bad_string, &e);
-	if (ep == &e)
-		NOTOK("returned success");
-	if (ep != NULL)
-		NOTOK("returned different pointer");
-	OK();
-}
-
-static void
-test_ether_aton(void)
-{
-	struct ether_addr *ep;
-
-	testnum++;
-	ep = ether_aton(ether_aton_string);
-	if (ep == NULL)
-		NOTOK("returned NULL");
-	if (bcmp(ep, &ether_aton_addr, ETHER_ADDR_LEN) != 0)
-		NOTOK("bad address");
-	OK();
-}
-
-static void
-test_ether_aton_bad(void)
-{
-	struct ether_addr *ep;
-
-	testnum++;
-	ep = ether_aton(ether_aton_bad_string);
-	if (ep != NULL)
-		NOTOK("returned success");
-	OK();
-}
-
-static const char		*ether_ntoa_string = "01:23:45:67:89:ab";
-static const struct ether_addr	 ether_ntoa_addr = {
-	{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
-};
-
-static void
-test_ether_ntoa_r(void)
-{
-	char buf[256], *cp;
-
-	testnum++;
-	cp = ether_ntoa_r(&ether_ntoa_addr, buf);
-	if (cp == NULL)
-		NOTOK("returned NULL");
-	if (cp != buf)
-		NOTOK("returned different pointer");
-	if (strcmp(cp, ether_ntoa_string) != 0)
-		NOTOK("bad string");
-	OK();
-}
-
-static void
-test_ether_ntoa(void)
-{
-	char *cp;
-
-	testnum++;
-	cp = ether_ntoa(&ether_ntoa_addr);
-	if (cp == NULL)
-		NOTOK("returned NULL");
-	if (strcmp(cp, ether_ntoa_string) != 0)
-		NOTOK("bad string");
-	OK();
-}
-
-static void
-test_ether_ntohost(void)
-{
-
-	testnum++;
-	TODO();
-}
-
-static void
-test_ether_hostton(void)
-{
-
-	testnum++;
-	TODO();
-}
-
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..11\n");
-
-	test_ether_line();
-	test_ether_line_bad_1();
-	test_ether_line_bad_2();
-	test_ether_aton_r();
-	test_ether_aton_r_bad();
-	test_ether_aton();
-	test_ether_aton_bad();
-	test_ether_ntoa_r();
-	test_ether_ntoa();
-	test_ether_ntohost();
-	test_ether_hostton();
-	return (0);
-}
diff --git a/tools/regression/lib/libc/net/test-ether.t b/tools/regression/lib/libc/net/test-ether.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/libc/net/test-ether.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.t b/tools/regression/lib/libc/net/test-eui64_aton.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/libc/net/test-eui64_aton.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.t b/tools/regression/lib/libc/net/test-eui64_ntoa.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable