Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Split inet_addr(3) tests from t_inet_network into stand-alon...



details:   https://anonhg.NetBSD.org/src/rev/217902826107
branches:  trunk
changeset: 807422:217902826107
user:      ginsbach <ginsbach%NetBSD.org@localhost>
date:      Thu Apr 09 16:47:56 2015 +0000

description:
Split inet_addr(3) tests from t_inet_network into stand-alone t_inet_addr,
so that t_inet_network only contains tests for inet_network(3).

diffstat:

 distrib/sets/lists/tests/mi          |    3 +-
 tests/lib/libc/inet/Makefile         |    4 +-
 tests/lib/libc/inet/t_inet_addr.c    |  109 +++++++++++++++++++++++++++++++++++
 tests/lib/libc/inet/t_inet_network.c |   68 +---------------------
 4 files changed, 115 insertions(+), 69 deletions(-)

diffs (244 lines):

diff -r 13b0faebc9ed -r 217902826107 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Thu Apr 09 10:55:23 2015 +0000
+++ b/distrib/sets/lists/tests/mi       Thu Apr 09 16:47:56 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.615 2015/04/05 06:37:25 martin Exp $
+# $NetBSD: mi,v 1.616 2015/04/09 16:47:57 ginsbach Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2454,6 +2454,7 @@
 ./usr/tests/lib/libc/inet                      tests-lib-tests
 ./usr/tests/lib/libc/inet/Atffile              tests-lib-tests         atf
 ./usr/tests/lib/libc/inet/Kyuafile             tests-lib-tests         atf,kyua
+./usr/tests/lib/libc/inet/t_inet_addr          tests-lib-tests         atf
 ./usr/tests/lib/libc/inet/t_inet_network       tests-lib-tests         atf
 ./usr/tests/lib/libc/locale                    tests-lib-tests
 ./usr/tests/lib/libc/locale/Atffile            tests-lib-tests         atf
diff -r 13b0faebc9ed -r 217902826107 tests/lib/libc/inet/Makefile
--- a/tests/lib/libc/inet/Makefile      Thu Apr 09 10:55:23 2015 +0000
+++ b/tests/lib/libc/inet/Makefile      Thu Apr 09 16:47:56 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2011/01/13 13:53:49 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/09 16:47:56 ginsbach Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/lib/libc/inet
 
-TESTS_C+=      t_inet_network
+TESTS_C+=      t_inet_addr t_inet_network
 
 .include <bsd.test.mk>
diff -r 13b0faebc9ed -r 217902826107 tests/lib/libc/inet/t_inet_addr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/inet/t_inet_addr.c Thu Apr 09 16:47:56 2015 +0000
@@ -0,0 +1,109 @@
+/* $NetBSD: t_inet_addr.c,v 1.1 2015/04/09 16:47:56 ginsbach Exp $ */
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ *
+ * 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 <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_inet_addr.c,v 1.1 2015/04/09 16:47:56 ginsbach Exp $");
+
+#include <arpa/inet.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <string.h>
+
+ATF_TC(inet_addr_basic);
+ATF_TC_HEAD(inet_addr_basic, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "Checks inet_addr(3)");
+}
+
+ATF_TC_BODY(inet_addr_basic, tc)
+{
+       static const char *addrs[] = {
+               "127.0.0.1", "99.99.99.99", "0.0.0.0", "255.255.255.255" };
+
+       struct in_addr ia;
+       const char *ian;
+       in_addr_t addr;
+       size_t i;
+
+       for (i = 0; i < __arraycount(addrs); i++) {
+
+               (void)fprintf(stderr, "checking %s\n", addrs[i]);;
+
+               addr = inet_addr(addrs[i]);
+               ia.s_addr = addr;
+               ian = inet_ntoa(ia);
+
+               ATF_REQUIRE(ian != NULL);
+               ATF_CHECK(strcmp(ian, addrs[i]) == 0);
+       }
+}
+
+ATF_TC(inet_addr_err);
+ATF_TC_HEAD(inet_addr_err, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "Invalid addresses with inet_addr(3)");
+}
+
+ATF_TC_BODY(inet_addr_err, tc)
+{
+       static const char *addrs[] = {
+               ". . . .", "1.2.3.", "0.0.0.256", "255.255.255.256",
+               "................................................",
+               "a.b.c.d", "0x0.0x1.0x2.0x3", "-1.-1.-1.-1", "", " "};
+
+       struct in_addr ia;
+       const char *ian;
+       in_addr_t addr;
+       size_t i;
+
+       for (i = 0; i < __arraycount(addrs); i++) {
+
+               (void)fprintf(stderr, "checking %s\n", addrs[i]);;
+
+               addr = inet_addr(addrs[i]);
+               ia.s_addr = addr;
+               ian = inet_ntoa(ia);
+
+               ATF_REQUIRE(ian != NULL);
+               ATF_CHECK(strcmp(ian, addrs[i]) != 0);
+       }
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+       ATF_TP_ADD_TC(tp, inet_addr_basic);
+       ATF_TP_ADD_TC(tp, inet_addr_err);
+
+       return atf_no_error();
+}
diff -r 13b0faebc9ed -r 217902826107 tests/lib/libc/inet/t_inet_network.c
--- a/tests/lib/libc/inet/t_inet_network.c      Thu Apr 09 10:55:23 2015 +0000
+++ b/tests/lib/libc/inet/t_inet_network.c      Thu Apr 09 16:47:56 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_inet_network.c,v 1.3 2011/07/15 11:27:23 jruoho Exp $ */
+/* $NetBSD: t_inet_network.c,v 1.4 2015/04/09 16:47:56 ginsbach Exp $ */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,79 +32,17 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_inet_network.c,v 1.3 2011/07/15 11:27:23 jruoho Exp $");
+__RCSID("$NetBSD: t_inet_network.c,v 1.4 2015/04/09 16:47:56 ginsbach Exp $");
 
 #include <arpa/inet.h>
 
 #include <atf-c.h>
-#include <stdio.h>
-#include <string.h>
 
 #define H_REQUIRE(input, expected)                                     \
        ATF_REQUIRE_EQ_MSG(inet_network(input), (in_addr_t) expected,   \
            "inet_network(%s) returned: 0x%08X, expected: %s", #input,  \
            inet_network(input), #expected)
 
-ATF_TC(inet_addr_basic);
-ATF_TC_HEAD(inet_addr_basic, tc)
-{
-       atf_tc_set_md_var(tc, "descr", "Checks inet_addr(3)");
-}
-
-ATF_TC_BODY(inet_addr_basic, tc)
-{
-       static const char *addrs[] = {
-               "127.0.0.1", "99.99.99.99", "0.0.0.0", "255.255.255.255" };
-
-       struct in_addr ia;
-       const char *ian;
-       in_addr_t addr;
-       size_t i;
-
-       for (i = 0; i < __arraycount(addrs); i++) {
-
-               (void)fprintf(stderr, "checking %s\n", addrs[i]);;
-
-               addr = inet_addr(addrs[i]);
-               ia.s_addr = addr;
-               ian = inet_ntoa(ia);
-
-               ATF_REQUIRE(ian != NULL);
-               ATF_CHECK(strcmp(ian, addrs[i]) == 0);
-       }
-}
-
-ATF_TC(inet_addr_err);
-ATF_TC_HEAD(inet_addr_err, tc)
-{
-       atf_tc_set_md_var(tc, "descr", "Invalid addresses with inet_addr(3)");
-}
-
-ATF_TC_BODY(inet_addr_err, tc)
-{
-       static const char *addrs[] = {
-               ". . . .", "1.2.3.", "0.0.0.256", "255.255.255.256",
-               "................................................",
-               "a.b.c.d", "0x0.0x1.0x2.0x3", "-1.-1.-1.-1", "", " "};
-
-       struct in_addr ia;
-       const char *ian;
-       in_addr_t addr;
-       size_t i;
-
-       for (i = 0; i < __arraycount(addrs); i++) {
-
-               (void)fprintf(stderr, "checking %s\n", addrs[i]);;
-
-               addr = inet_addr(addrs[i]);
-               ia.s_addr = addr;
-               ian = inet_ntoa(ia);
-
-               ATF_REQUIRE(ian != NULL);
-               ATF_CHECK(strcmp(ian, addrs[i]) != 0);
-       }
-}
-
 ATF_TC(inet_network_basic);
 ATF_TC_HEAD(inet_network_basic, tc)
 {
@@ -161,8 +99,6 @@
 ATF_TP_ADD_TCS(tp)
 {
 
-       ATF_TP_ADD_TC(tp, inet_addr_basic);
-       ATF_TP_ADD_TC(tp, inet_addr_err);
        ATF_TP_ADD_TC(tp, inet_network_basic);
        ATF_TP_ADD_TC(tp, inet_network_err);
 



Home | Main Index | Thread Index | Old Index