Date: Sun, 8 Nov 2015 23:06:40 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290563 - in head: lib/libc/tests/net tools/regression/lib/libc/net Message-ID: <201511082306.tA8N6eF6036888@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 8 23:06:40 2015 New Revision: 290563 URL: https://svnweb.freebsd.org/changeset/base/290563 Log: 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. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Added: head/lib/libc/tests/net/ether_test.c - copied, changed from r290562, head/tools/regression/lib/libc/net/test-ether.c head/lib/libc/tests/net/eui64_aton_test.c - copied, changed from r290562, head/tools/regression/lib/libc/net/test-eui64_aton.c head/lib/libc/tests/net/eui64_ntoa_test.c - copied, changed from r290562, head/tools/regression/lib/libc/net/test-eui64_ntoa.c head/lib/libc/tests/net/test-eui64.h - copied unchanged from r290562, head/tools/regression/lib/libc/net/test-eui64.h Deleted: head/tools/regression/lib/libc/net/ Modified: head/lib/libc/tests/net/Makefile Modified: head/lib/libc/tests/net/Makefile ============================================================================== --- head/lib/libc/tests/net/Makefile Sun Nov 8 22:23:21 2015 (r290562) +++ head/lib/libc/tests/net/Makefile Sun Nov 8 23:06:40 2015 (r290563) @@ -1,22 +1,23 @@ # $FreeBSD$ -.include <bsd.own.mk> +ATF_TESTS_C+= ether_test +ATF_TESTS_C+= eui64_aton_test +ATF_TESTS_C+= eui64_ntoa_test -BINDIR= ${TESTSDIR} +CFLAGS+= -I${.CURDIR} -NETBSD_ATF_TESTS_C= getprotoent_test +NETBSD_ATF_TESTS_C+= getprotoent_test NETBSD_ATF_TESTS_C+= ether_aton_test -SRCS.t_ether_aton= aton_ether_subr.c t_ether_aton.c - -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 @@ -26,12 +27,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> Copied and modified: head/lib/libc/tests/net/ether_test.c (from r290562, head/tools/regression/lib/libc/net/test-ether.c) ============================================================================== --- head/tools/regression/lib/libc/net/test-ether.c Sun Nov 8 22:23:21 2015 (r290562, copy source) +++ head/lib/libc/tests/net/ether_test.c Sun Nov 8 23:06:40 2015 (r290563) @@ -30,206 +30,163 @@ #include <net/ethernet.h> +#include <errno.h> #include <stdio.h> #include <string.h> -static int testnum; +#include <atf-c.h> -#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 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) +ATF_TC_WITHOUT_HEAD(ether_line); +ATF_TC_BODY(ether_line, tc) { struct ether_addr e; char hostname[256]; - testnum++; - if (ether_line(ether_line_string, &e, hostname) != 0) - NOTOK("returned error"); - if (bcmp(&e, ðer_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(); + ATF_REQUIRE_MSG(ether_line(ether_line_string, &e, hostname) == 0, + "ether_line failed; errno=%d", errno); + ATF_REQUIRE_MSG(bcmp(&e, ðer_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"; +static const char *ether_line_bad_1_string = "x"; -static void -test_ether_line_bad_1(void) +ATF_TC_WITHOUT_HEAD(ether_line_bad_1); +ATF_TC_BODY(ether_line_bad_1, tc) { struct ether_addr e; char hostname[256]; - testnum++; - if (ether_line(ether_line_bad_1_string, &e, hostname) == 0) - NOTOK("returned success"); - OK(); + ATF_REQUIRE_MSG(ether_line(ether_line_bad_1_string, &e, hostname) != 0, + "ether_line succeeded unexpectedly", errno); } -static const char *ether_line_bad_2_string = "x x"; +static const char *ether_line_bad_2_string = "x x"; -static void -test_ether_line_bad_2(void) +ATF_TC_WITHOUT_HEAD(ether_line_bad_2); +ATF_TC_BODY(ether_line_bad_2, tc) { struct ether_addr e; char hostname[256]; - testnum++; - if (ether_line(ether_line_bad_2_string, &e, hostname) == 0) - NOTOK("returned success"); - OK(); + ATF_REQUIRE_MSG(ether_line(ether_line_bad_2_string, &e, hostname) != 0, + "ether_line succeeded unexpectedly", errno); } -static const char *ether_aton_string = "01:23:45:67:89:ab"; +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) +ATF_TC_WITHOUT_HEAD(ether_aton_r); +ATF_TC_BODY(ether_aton_r, tc) { 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, ðer_aton_addr, ETHER_ADDR_LEN) != 0) - NOTOK("bad address"); - OK(); + + ATF_REQUIRE_MSG(ep != NULL, "ether_aton_r failed", errno); + ATF_REQUIRE_MSG(ep == &e, + "ether_aton_r returned different pointers; %p != %p", ep, &e); } static const char *ether_aton_bad_string = "x"; -static void -test_ether_aton_r_bad(void) +ATF_TC_WITHOUT_HEAD(ether_aton_r_bad); +ATF_TC_BODY(ether_aton_r_bad, tc) { 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(); + ATF_REQUIRE_MSG(ep == NULL, "ether_aton_r succeeded unexpectedly"); } -static void -test_ether_aton(void) +ATF_TC_WITHOUT_HEAD(ether_aton); +ATF_TC_BODY(ether_aton, tc) { struct ether_addr *ep; - testnum++; ep = ether_aton(ether_aton_string); - if (ep == NULL) - NOTOK("returned NULL"); - if (bcmp(ep, ðer_aton_addr, ETHER_ADDR_LEN) != 0) - NOTOK("bad address"); - OK(); + ATF_REQUIRE_MSG(ep != NULL, "ether_aton failed"); + ATF_REQUIRE_MSG(bcmp(ep, ðer_aton_addr, ETHER_ADDR_LEN) == 0, + "bad address"); } -static void -test_ether_aton_bad(void) +ATF_TC_WITHOUT_HEAD(ether_aton_bad); +ATF_TC_BODY(ether_aton_bad, tc) { struct ether_addr *ep; - testnum++; ep = ether_aton(ether_aton_bad_string); - if (ep != NULL) - NOTOK("returned success"); - OK(); + ATF_REQUIRE_MSG(ep == NULL, "ether_aton succeeded unexpectedly"); } -static const char *ether_ntoa_string = "01:23:45:67:89:ab"; +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) +ATF_TC_WITHOUT_HEAD(ether_ntoa_r); +ATF_TC_BODY(ether_ntoa_r, tc) { char buf[256], *cp; - testnum++; cp = ether_ntoa_r(ðer_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(); + 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); } -static void -test_ether_ntoa(void) +ATF_TC_WITHOUT_HEAD(ether_ntoa); +ATF_TC_BODY(ether_ntoa, tc) { char *cp; - testnum++; cp = ether_ntoa(ðer_ntoa_addr); - if (cp == NULL) - NOTOK("returned NULL"); - if (strcmp(cp, ether_ntoa_string) != 0) - NOTOK("bad string"); - OK(); + 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); } -static void -test_ether_ntohost(void) +#if 0 +ATF_TC_WITHOUT_HEAD(ether_ntohost); +ATF_TC_BODY(ether_ntohost, tc) { - testnum++; - TODO(); } -static void -test_ether_hostton(void) +ATF_TC_WITHOUT_HEAD(ether_hostton); +ATF_TC_BODY(ether_hostton, tc) { - testnum++; - TODO(); } +#endif -int -main(int argc, char *argv[]) +ATF_TP_ADD_TCS(tp) { - printf("1..11\n"); + 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 - 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); + return (atf_no_error()); } Copied and modified: head/lib/libc/tests/net/eui64_aton_test.c (from r290562, head/tools/regression/lib/libc/net/test-eui64_aton.c) ============================================================================== --- head/tools/regression/lib/libc/net/test-eui64_aton.c Sun Nov 8 22:23:21 2015 (r290562, copy source) +++ head/lib/libc/tests/net/eui64_aton_test.c Sun Nov 8 23:06:40 2015 (r290563) @@ -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++; - - if (eui64_aton(str, &e) != 0 && - memcmp(&e, &eui, sizeof(struct eui64)) != 0) { - printf("not ok %d - : eui64_aton(%s)\n", test, str); + struct eui64 e; + char buf[EUI64_SIZ]; + int rc; + + 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()); } Copied and modified: head/lib/libc/tests/net/eui64_ntoa_test.c (from r290562, head/tools/regression/lib/libc/net/test-eui64_ntoa.c) ============================================================================== --- head/tools/regression/lib/libc/net/test-eui64_ntoa.c Sun Nov 8 22:23:21 2015 (r290562, copy source) +++ head/lib/libc/tests/net/eui64_ntoa_test.c Sun Nov 8 23:06:40 2015 (r290563) @@ -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()); } Copied: head/lib/libc/tests/net/test-eui64.h (from r290562, head/tools/regression/lib/libc/net/test-eui64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/tests/net/test-eui64.h Sun Nov 8 23:06:40 2015 (r290563, copy of r290562, head/tools/regression/lib/libc/net/test-eui64.h) @@ -0,0 +1,55 @@ +/* + * 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511082306.tA8N6eF6036888>