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

8 files changed, 0 insertions, 459 deletions

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.h b/tools/regression/lib/libc/net/test-eui64.h
deleted file mode 100644
index ea82a10..0000000
--- a/tools/regression/lib/libc/net/test-eui64.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2004 The Aerospace Corporation.  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.
- * 3.  The name of The Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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$
- */
-#ifndef _TEST_EUI64_H
-#define _TEST_EUI64_H
-
-struct eui64	test_eui64_id = {{0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77}};
-struct eui64	test_eui64_eui48 = {{0x00,0x11,0x22,0xFF,0xFE,0x33,0x44,0x55}};
-struct eui64	test_eui64_mac48 = {{0x00,0x11,0x22,0xFF,0xFF,0x33,0x44,0x55}};
-
-#define test_eui64_id_ascii		"00-11-22-33-44-55-66-77"
-#define test_eui64_id_colon_ascii	"00:11:22:33:44:55:66:77"
-#define test_eui64_hex_ascii		"0x0011223344556677"
-#define test_eui64_eui48_ascii		"00-11-22-ff-fe-33-44-55"
-#define test_eui64_mac48_ascii		"00-11-22-ff-fe-33-44-55"
-#define test_eui64_mac_ascii		"00-11-22-33-44-55"
-#define test_eui64_mac_colon_ascii	"00:11:22:33:44:55"
-#define test_eui64_id_host		"id"
-#define test_eui64_eui48_host		"eui-48"
-#define test_eui64_mac48_host		"mac-48"
-
-#define	test_eui64_line_id		"00-11-22-33-44-55-66-77 id"
-#define	test_eui64_line_id_colon	"00:11:22:33:44:55:66:77  id"
-#define	test_eui64_line_eui48		"00-11-22-FF-fe-33-44-55	eui-48"
-#define	test_eui64_line_mac48		"00-11-22-FF-ff-33-44-55	 mac-48"
-#define	test_eui64_line_eui48_6byte	"00-11-22-33-44-55 eui-48"
-#define	test_eui64_line_eui48_6byte_c	"00:11:22:33:44:55 eui-48"
-
-#endif /* !_TEST_EUI64_H */
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.c b/tools/regression/lib/libc/net/test-eui64_aton.c
deleted file mode 100644
index e10f985..0000000
--- a/tools/regression/lib/libc/net/test-eui64_aton.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2004 The Aerospace Corporation.  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.
- * 3.  The name of The Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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 <sys/eui64.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "test-eui64.h"
-
-static int
-test_str( const char *str, const struct eui64 *eui)
-{
-	struct eui64	e;
-	char		buf[EUI64_SIZ];
-	static int	test = 0;
-
-	test++;
-
-	if (eui64_aton(str, &e) != 0 &&
-	    memcmp(&e, &eui, sizeof(struct eui64)) != 0) {
-		printf("not ok %d - : eui64_aton(%s)\n", test, str);
-		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);
-	}
-
-}
-
-int
-main(int argc, char **argv)
-{
-
-	printf("1..5\n");
-
-	test_str(test_eui64_id_ascii, &test_eui64_id);
-	test_str(test_eui64_id_colon_ascii, &test_eui64_id);
-	test_str(test_eui64_mac_ascii, &test_eui64_eui48);
-	test_str(test_eui64_mac_colon_ascii, &test_eui64_eui48);
-	test_str(test_eui64_hex_ascii, &test_eui64_id);
-
-	return (0);
-}
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.c b/tools/regression/lib/libc/net/test-eui64_ntoa.c
deleted file mode 100644
index f7582f0..0000000
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2004 The Aerospace Corporation.  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.
- * 3.  The name of The Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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 <sys/eui64.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "test-eui64.h"
-
-int
-main(int argc, char **argv)
-{
-	char a[EUI64_SIZ];
-
-	printf("1..1\n");
-
-	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);
-
-	printf("not ok 1 - eui64_ntoa\n");
-	return (0);
-}
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