From 8864cde3495dbfd6b476c1b77a8bde035e1cf000 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 10 Feb 2017 01:13:12 +0000 Subject: MFC r305358,r305449,r305451,r306367,r306397,r309474: This also contains a merge of ^/projects/netbsd-tests-update-12@r304035 . This change never hit ^/head because bin/cat's behavior was changed (on ^/head) to match NetBSD. PR: 210607 r305358: Update contrib/netbsd-tests with new content from NetBSD This updates the snapshot from 09/30/2014 to 08/11/2016 This brings in a number of new testcases from upstream, most notably: - bin/cat - lib/libc - lib/msun - lib/libthr - usr.bin/sort lib/libc/tests/stdio/open_memstream_test.c was moved to lib/libc/tests/stdio/open_memstream2_test.c to accomodate the new open_memstream test from NetBSD. Tested on: amd64 (VMware fusion VM; various bare metal platforms); i386 (VMware fusion VM); make tinderbox r305449: Install h_db to unbreak some of the lib/libc/db testcases after r305358 r305451: Fix lib/libc/rpc test assumptions added in r305358 - Require root in the tcp/udp subtests (it's needed on FreeBSD when registering services). - Skip the tests if service registration fails. r306367 (by br): Allow up to 6 arguments only on MIPS. r306397 (by br): Use right piece of code for FreeBSD. r309474: Don't build :strvis_locale if VIS_NOLOCALE is undefined The copy of contrib/libc-vis on ^/stable/10 doesn't contain all of the features in the ^/stable/11 // ^/head version, including VIS_NOLOCALE. The risk is lower in conditionally running the test instead of backporting the newer version of libc-vis --- contrib/netbsd-tests/sys/net/t_print.c | 172 +++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 contrib/netbsd-tests/sys/net/t_print.c (limited to 'contrib/netbsd-tests/sys/net/t_print.c') diff --git a/contrib/netbsd-tests/sys/net/t_print.c b/contrib/netbsd-tests/sys/net/t_print.c new file mode 100644 index 0000000..0aaeb30 --- /dev/null +++ b/contrib/netbsd-tests/sys/net/t_print.c @@ -0,0 +1,172 @@ +/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */ + +/*- + * Copyright (c) 2014 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ +#include +__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $"); + +#include "net/dl_print.c" + +#include + +static const struct { + struct dl_addr ia; + const char *str; + int len; +} tst[] = { + { + { + .dl_type = 6, + .dl_nlen = 0, + .dl_alen = 6, + .dl_slen = 0, + .dl_data = { + (char)0x01, (char)0xa2, (char)0x03, + (char)0xc4, (char)0x05, (char)0xf6, + }, + }, + "/6#01:a2:03:c4:05:f6", + 20, + }, + { + { + .dl_type = 24, + .dl_nlen = 3, + .dl_alen = 6, + .dl_slen = 0, + .dl_data = { + 'l', 'o', '0', + (char)0x11, (char)0x22, (char)0x33, + (char)0x44, (char)0x55, (char)0x66, + }, + }, + "lo0/24#11:22:33:44:55:66", + 24, + }, + { + { + .dl_type = 24, + .dl_nlen = 7, + .dl_alen = 1, + .dl_slen = 0, + .dl_data = { + 'n', 'p', 'f', 'l', 'o', 'g', '0', (char)0xa5, + }, + }, + "npflog0/24#a5", + 13, + }, + { + { + .dl_type = 0, + .dl_nlen = 0, + .dl_alen = 0, + .dl_slen = 0, + .dl_data = { + '\0' + }, + }, + "/0#", + 3, + }, +}; + + +ATF_TC(dl_print); +ATF_TC_HEAD(dl_print, tc) +{ + + atf_tc_set_md_var(tc, "descr", "printing of link address"); +} + +ATF_TC_BODY(dl_print, tc) +{ + char buf[LINK_ADDRSTRLEN]; + int r; + size_t l = sizeof(buf); + + for (size_t i = 0; i < __arraycount(tst); i++) { + r = dl_print(buf, l, &tst[i].ia); + ATF_REQUIRE_STREQ(buf, tst[i].str); + ATF_REQUIRE_EQ(r, tst[i].len); + } + + l = 4; + for (size_t i = 0; i < __arraycount(tst); i++) { + r = dl_print(buf, l, &tst[i].ia); + ATF_CHECK(strncmp(buf, tst[i].str, l - 1) == 0); + if (r > (int)l) + ATF_REQUIRE_EQ(buf[l - 1], '\0'); + ATF_REQUIRE_EQ(r, tst[i].len); + } +} + +ATF_TC(sdl_print); +ATF_TC_HEAD(sdl_print, tc) +{ + + atf_tc_set_md_var(tc, "descr", "printing of sockaddr_dl"); +} + +ATF_TC_BODY(sdl_print, tc) +{ + char buf[1024]; + char res[1024]; + int r, e; + size_t l = sizeof(buf); + struct sockaddr_dl sdl; + + memset(&sdl, 0, sizeof(sdl)); + for (size_t i = 0; i < __arraycount(tst); i++) { + memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr)); + sdl.sdl_index = (uint16_t)i; + r = sdl_print(buf, l, &sdl); + e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); + ATF_REQUIRE_STREQ(buf, res); + ATF_REQUIRE_EQ(r, e); + } + + l = 8; + for (size_t i = 0; i < __arraycount(tst); i++) { + memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr)); + sdl.sdl_index = (uint16_t)i; + r = sdl_print(buf, l, &sdl); + e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); + ATF_REQUIRE_STREQ(buf, res); + ATF_REQUIRE_EQ(r, e); + } +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dl_print); + ATF_TP_ADD_TC(tp, sdl_print); + return atf_no_error(); +} -- cgit v1.1 From b39322d52d2dd66d37af0ffcbfb48d13896804ea Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 10 Feb 2017 07:13:16 +0000 Subject: MFC r311925,r311968,r311969,r312008: r311925: Import testcase updates with code contributed back to NetBSD This also (inadvertently) contains an update to contrib/netbsd-tests/lib/libc/sys/t_wait.c (new testcases). In collaboration with: christos@NetBSD.org r311968: Fix lib/libc/sys/access_test after r311925 sys/param.h needs to be #included in order for __FreeBSD_version to be checked r311969: Remove __HAVE_LONG_DOUBLE #define from t_strtod.c and place it in Makefile This is to enable support in other testcases Inspired by lib/msun/tests/Makefile . r312008: Upgrade NetBSD tests to 01.11.2017_23.20 snapshot This contains some new testcases in /usr/tests/...: - .../lib/libc - .../lib/libthr - .../lib/msun - .../sys/kern Tested on: amd64, i386 --- contrib/netbsd-tests/sys/net/t_print.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'contrib/netbsd-tests/sys/net/t_print.c') diff --git a/contrib/netbsd-tests/sys/net/t_print.c b/contrib/netbsd-tests/sys/net/t_print.c index 0aaeb30..ff17895 100644 --- a/contrib/netbsd-tests/sys/net/t_print.c +++ b/contrib/netbsd-tests/sys/net/t_print.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */ +/* $NetBSD: t_print.c,v 1.2 2016/08/27 11:30:49 christos Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $"); +__RCSID("$NetBSD: t_print.c,v 1.2 2016/08/27 11:30:49 christos Exp $"); #include "net/dl_print.c" @@ -147,7 +147,10 @@ ATF_TC_BODY(sdl_print, tc) memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr)); sdl.sdl_index = (uint16_t)i; r = sdl_print(buf, l, &sdl); - e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); + if (i == 3) + e = snprintf(res, l, "link#%zu", i); + else + e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); ATF_REQUIRE_STREQ(buf, res); ATF_REQUIRE_EQ(r, e); } @@ -157,7 +160,10 @@ ATF_TC_BODY(sdl_print, tc) memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr)); sdl.sdl_index = (uint16_t)i; r = sdl_print(buf, l, &sdl); - e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); + if (i == 3) + e = snprintf(res, l, "link#%zu", i); + else + e = snprintf(res, l, "[%s]:%zu", tst[i].str, i); ATF_REQUIRE_STREQ(buf, res); ATF_REQUIRE_EQ(r, e); } -- cgit v1.1