* Remove useless comments.
* Move the test body from main() to (*testfunc[])().
* In every test function, using TINFO instead of TPASS
marks the success of each inner test.
Signed-off-by: Xing Gu <gux.f...@cn.fujitsu.com>
---
testcases/network/lib6/in6_01.c | 242 +++++++++++++++++++++++-----------------
1 file changed, 141 insertions(+), 101 deletions(-)
diff --git a/testcases/network/lib6/in6_01.c b/testcases/network/lib6/in6_01.c
index ef2ff88..4b3c549 100644
--- a/testcases/network/lib6/in6_01.c
+++ b/testcases/network/lib6/in6_01.c
@@ -1,6 +1,7 @@
/*
*
* Copyright (c) International Business Machines Corp., 2001
+ * Author: David L Stevens
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -13,26 +14,13 @@
* the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
/*
- * Test Name: in6_01
- *
- * Test Description:
- * Verify that in6 and sockaddr fields are present. Most of these are
- * "PASS" if they just compile.
- *
- * Usage: <for command-line>
- * in6_01
- *
- * HISTORY
- * 05/2004 written by David L Stevens
- *
- * RESTRICTIONS:
- * None.
- *
+ * Description:
+ * Verify that in6 and sockaddr fields are present. Most of these are
+ * "PASS" if they just compile.
*/
#include <stdio.h>
@@ -45,52 +33,53 @@
#include "test.h"
#include "usctest.h"
-char *TCID = "in6_01"; /* Test program identifier. */
-
-void setup(void), cleanup(void);
-
-struct {
+static struct {
char *addr;
int ismap;
} maptab[] = {
- {
- "2002::1", 0}, {
- "::ffff:10.0.0.1", 1}, {
- "::fffe:10.0.0.1", 0}, {
- "::7fff:10.0.0.1", 0}, {
- "0:0:0:0:0:0:ffff:0a001", 1}, {
-"0:0:1:0:0:0:ffff:0a001", 0},};
+ { "2002::1", 0 },
+ { "::ffff:10.0.0.1", 1 },
+ { "::fffe:10.0.0.1", 0 },
+ { "::7fff:10.0.0.1", 0 },
+ { "0:0:0:0:0:0:ffff:0a001", 0 },
+ { "0:0:1:0:0:0:ffff:0a001", 0 },
+};
#define MAPSIZE (sizeof(maptab)/sizeof(maptab[0]))
-struct {
+static struct {
char *addr;
} sstab[] = {
- {
- "2002::1"}, {
- "10.0.0.1"}, {
- "::ffff:10.0.0.1"}, {
- "::1"}, {
-"::"},};
+ { "2002::1" },
+ { "10.0.0.1" },
+ { "::ffff:10.0.0.1" },
+ { "::1" },
+ { "::" },
+};
#define SSSIZE (sizeof(sstab)/sizeof(sstab[0]))
-int TST_TOTAL = 9 + MAPSIZE + SSSIZE;
+static void setup(void);
+static void cleanup(void);
+static void test_in6_addr(void);
+static void test_sockaddr_in6(void);
+static void test_global_in6_def(void);
+static void test_in6_is_addr_v4mapped(void);
+static void test_sockaddr_storage(void);
+
+static void (*testfunc[])(void) = { test_in6_addr,
+ test_sockaddr_in6, test_global_in6_def,
+ test_in6_is_addr_v4mapped, test_sockaddr_storage };
+
+char *TCID = "in6_01";
+int TST_TOTAL = ARRAY_SIZE(testfunc);
int main(int argc, char *argv[])
{
- uint8_t ui8 = 1;
- uint32_t ui16 = 2;
- uint32_t ui32 = 3;
- struct in6_addr in6;
- struct in6_addr ina6 = IN6ADDR_ANY_INIT;
- struct in6_addr inl6 = IN6ADDR_LOOPBACK_INIT;
- struct sockaddr_in6 sin6;
- struct sockaddr_storage ss;
+ int lc;
int i;
const char *msg;
- /* Parse standard options given to run the test. */
msg = parse_opts(argc, argv, NULL, NULL);
if (msg != NULL) {
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
@@ -98,62 +87,128 @@ int main(int argc, char *argv[])
setup();
- /* struct in6_addr tests */
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+
+ for (i = 0; i < TST_TOTAL; i++)
+ (*testfunc[i])();
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void setup(void)
+{
+ TEST_PAUSE;
+}
+
+static void cleanup(void)
+{
+ TEST_CLEANUP;
+}
+
+/* struct in6_addr tests */
+static void test_in6_addr(void)
+{
+ uint8_t ui8 = 1;
+ struct in6_addr in6;
+
in6.s6_addr[0] = ui8;
- tst_resm(TPASS, "type of in6.s6_addr[0] is uint8_t");
+ tst_resm(TINFO, "type of in6.s6_addr[0] is uint8_t");
if (sizeof(in6.s6_addr) != 16)
tst_resm(TFAIL, "sizeof(in6.s6_addr) != 16");
else
tst_resm(TPASS, "sizeof(in6.s6_addr) == 16");
+}
- /* struct sockaddr_in6 tests */
+/* struct sockaddr_in6 tests */
+static void test_sockaddr_in6(void)
+{
+ uint8_t ui8 = 1;
+ uint32_t ui16 = 2;
+ uint32_t ui32 = 3;
+ struct in6_addr in6;
+ struct sockaddr_in6 sin6;
+
+ in6.s6_addr[0] = ui8;
sin6.sin6_family = AF_INET6;
sin6.sin6_port = ui16;
sin6.sin6_flowinfo = ui32;
sin6.sin6_addr = in6;
sin6.sin6_scope_id = ui32;
tst_resm(TPASS, "all sockaddr_in6 fields present and correct");
+}
- /* initializers and global in6 definitions tests */
- tst_resm(TPASS, "IN6ADDR_ANY_INIT present");
- if (memcmp(&ina6, &in6addr_any, sizeof(ina6)) == 0)
- tst_resm(TPASS, "in6addr_any present and correct");
- else
+/* initializers and global in6 definitions tests */
+static void test_global_in6_def(void)
+{
+ struct in6_addr ina6 = IN6ADDR_ANY_INIT;
+ struct in6_addr inl6 = IN6ADDR_LOOPBACK_INIT;
+
+ tst_resm(TINFO, "IN6ADDR_ANY_INIT present");
+ if (memcmp(&ina6, &in6addr_any, sizeof(ina6)) == 0) {
+ tst_resm(TINFO, "in6addr_any present and correct");
+ } else {
tst_resm(TFAIL, "in6addr_any incorrect value");
- tst_resm(TPASS, "IN6ADDR_LOOPBACK_INIT present");
- if (memcmp(&inl6, &in6addr_loopback, sizeof(inl6)) == 0)
- tst_resm(TPASS, "in6addr_loopback present and correct");
- else
+ return;
+ }
+
+ tst_resm(TINFO, "IN6ADDR_LOOPBACK_INIT present");
+ if (memcmp(&inl6, &in6addr_loopback, sizeof(inl6)) == 0) {
+ tst_resm(TINFO, "in6addr_loopback present and correct");
+ } else {
tst_resm(TFAIL, "in6addr_loopback incorrect value");
+ return;
+ }
if (inet_pton(AF_INET6, "::1", &inl6) <= 0)
- tst_resm(TBROK, "inet_pton(\"::1\")");
- else if (memcmp(&inl6, &in6addr_loopback, sizeof(inl6)) == 0)
- tst_resm(TPASS, "in6addr_loopback in network byte order");
- else
+ tst_brkm(TBROK | TERRNO, cleanup, "inet_pton(\"::1\")");
+ if (memcmp(&inl6, &in6addr_loopback, sizeof(inl6)) == 0) {
+ tst_resm(TINFO, "in6addr_loopback in network byte order");
+ } else {
tst_resm(TFAIL, "in6addr_loopback has wrong byte order");
+ return;
+ }
+
+ tst_resm(TPASS, "global in6 definitions tests succeed");
+}
- /* IN6_IS_ADDR_V4MAPPED tests */
+/* IN6_IS_ADDR_V4MAPPED tests */
+static void test_in6_is_addr_v4mapped(void)
+{
+ unsigned int i;
+ struct in6_addr in6;
for (i = 0; i < MAPSIZE; ++i) {
if (inet_pton(AF_INET6, maptab[i].addr, &in6) <= 0) {
- tst_resm(TBROK, "\"%s\" is not a valid IPv6 address",
- maptab[i].addr);
- continue;
+ tst_brkm(TBROK | TERRNO, cleanup,
+ "\"%s\" is not a valid IPv6 address",
+ maptab[i].addr);
}
TEST(IN6_IS_ADDR_V4MAPPED(in6.s6_addr));
- if (TEST_RETURN == maptab[i].ismap)
- tst_resm(TEST_RETURN == maptab[i].ismap ? TPASS : TFAIL,
- "IN6_IS_ADDR_V4MAPPED(\"%s\") %ld",
- maptab[i].addr, TEST_RETURN);
+ if (TEST_RETURN == maptab[i].ismap) {
+ tst_resm(TINFO, "IN6_IS_ADDR_V4MAPPED(\"%s\") %ld",
+ maptab[i].addr, TEST_RETURN);
+ } else {
+ tst_resm(TFAIL, "IN6_IS_ADDR_V4MAPPED(\"%s\") %ld",
+ maptab[i].addr, TEST_RETURN);
+ return;
+ }
}
- /* sockaddr_storage tests */
+ tst_resm(TPASS, "IN6_IS_ADDR_V4MAPPED tests succeed");
+}
+
+/* sockaddr_storage tests */
+static void test_sockaddr_storage(void)
+{
+ unsigned int i;
+ struct sockaddr_storage ss;
if (sizeof(ss) <= sizeof(struct sockaddr_in) ||
- sizeof(ss) <= sizeof(struct sockaddr_in6))
- tst_resm(TFAIL, "sockaddr_storage too small");
- else
- tst_resm(TPASS, "sockaddr_storage size ok");
+ sizeof(ss) <= sizeof(struct sockaddr_in6))
+ tst_brkm(TBROK, cleanup, "sockaddr_storage too small");
+
for (i = 0; i < SSSIZE; ++i) {
struct sockaddr_in *psin = (struct sockaddr_in *)&ss;
struct sockaddr_in6 *psin6 = (struct sockaddr_in6 *)&ss;
@@ -165,35 +220,20 @@ int main(int argc, char *argv[])
if (rv == 0) {
af = psin6->sin6_family = AF_INET6;
rv = inet_pton(AF_INET6, sstab[i].addr,
- &psin6->sin6_addr);
+ &psin6->sin6_addr);
}
if (rv <= 0) {
- tst_resm(TBROK, "\"%s\" is not a valid address",
- sstab[i].addr);
- continue;
+ tst_brkm(TBROK, cleanup,
+ "\"%s\" is not a valid address", sstab[i].addr);
}
- if (ss.ss_family == af)
- tst_resm(TPASS, "\"%s\" is AF_INET%s",
- sstab[i].addr, af == AF_INET ? "" : "6");
- else
+ if (ss.ss_family == af) {
+ tst_resm(TINFO, "\"%s\" is AF_INET%s",
+ sstab[i].addr, af == AF_INET ? "" : "6");
+ } else {
tst_resm(TFAIL, "\"%s\" ss_family (%d) != AF_INET%s",
- sstab[i].addr, af, af == AF_INET ? "" : "6");
+ sstab[i].addr, af, af == AF_INET ? "" : "6");
+ }
}
- cleanup();
-
- return (0);
-}
-
-pid_t pid;
-
-void setup(void)
-{
- TEST_PAUSE; /* if -P option specified */
-}
-
-void cleanup(void)
-{
- TEST_CLEANUP;
-
+ tst_resm(TPASS, "sockaddr_storage tests succeed");
}
--
1.9.3
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
