Source-Changes-HG archive

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

[src/trunk]: src/tests/lib/libc Atf-ify the getaddrinfo test, with updated "g...



details:   https://anonhg.NetBSD.org/src/rev/9bd95d21bd08
branches:  trunk
changeset: 760715:9bd95d21bd08
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Jan 11 16:30:53 2011 +0000

description:
Atf-ify the getaddrinfo test, with updated "golden" output files.

diffstat:

 tests/lib/libc/Makefile                      |    6 +-
 tests/lib/libc/getaddrinfo/Makefile          |   25 +++
 tests/lib/libc/getaddrinfo/README            |    7 +
 tests/lib/libc/getaddrinfo/basics_v4.exp     |   36 ++++
 tests/lib/libc/getaddrinfo/basics_v4v6.exp   |   42 +++++
 tests/lib/libc/getaddrinfo/h_gai.c           |  186 +++++++++++++++++++++++++
 tests/lib/libc/getaddrinfo/no_host_v4.exp    |   38 +++++
 tests/lib/libc/getaddrinfo/no_host_v4v6.exp  |   56 +++++++
 tests/lib/libc/getaddrinfo/no_serv_v4.exp    |   14 +
 tests/lib/libc/getaddrinfo/no_serv_v4v6.exp  |   16 ++
 tests/lib/libc/getaddrinfo/scoped.exp        |    4 +
 tests/lib/libc/getaddrinfo/sock_raw_v4.exp   |   13 +
 tests/lib/libc/getaddrinfo/sock_raw_v4v6.exp |   15 ++
 tests/lib/libc/getaddrinfo/spec_fam_v4.exp   |    6 +
 tests/lib/libc/getaddrinfo/spec_fam_v4v6.exp |    8 +
 tests/lib/libc/getaddrinfo/t_getaddrinfo.sh  |  198 +++++++++++++++++++++++++++
 tests/lib/libc/getaddrinfo/unsup_fam.exp     |    2 +
 17 files changed, 669 insertions(+), 3 deletions(-)

diffs (truncated from 747 to 300 lines):

diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/Makefile
--- a/tests/lib/libc/Makefile   Tue Jan 11 16:19:38 2011 +0000
+++ b/tests/lib/libc/Makefile   Tue Jan 11 16:30:53 2011 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2011/01/10 04:57:56 christos Exp $
+# $NetBSD: Makefile,v 1.28 2011/01/11 16:30:53 pgoyette Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>
 
-TESTS_SUBDIRS+=        db gen hash ieeefp regex rpc setjmp stdlib stdio string sys
-TESTS_SUBDIRS+=        ttyio
+TESTS_SUBDIRS+=        db gen getaddrinfo hash ieeefp regex rpc setjmp stdlib
+TESTS_SUBDIRS+=        stdio string sys ttyio
 
 .if ${HAS_SSP} == "yes"
 TESTS_SUBDIRS+=        ssp
diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/getaddrinfo/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/getaddrinfo/Makefile       Tue Jan 11 16:30:53 2011 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2011/01/11 16:30:53 pgoyette Exp $
+
+MKMAN= no
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/lib/libc/getaddrinfo
+
+TESTS_SH+=     t_getaddrinfo
+
+BINDIR=                ${TESTSDIR}
+
+PROGS=         h_gai
+
+FILESDIR=      ${TESTSDIR}/data
+
+FILES+=                basics_v4.exp   basics_v4v6.exp
+FILES+=                no_host_v4.exp  no_host_v4v6.exp
+FILES+=                no_serv_v4.exp  no_serv_v4v6.exp
+FILES+=                sock_raw_v4.exp sock_raw_v4v6.exp
+FILES+=                spec_fam_v4.exp spec_fam_v4v6.exp
+FILES+=                scoped.exp
+FILES+=                unsup_fam.exp
+
+.include <bsd.test.mk>
diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/getaddrinfo/README
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/getaddrinfo/README Tue Jan 11 16:30:53 2011 +0000
@@ -0,0 +1,7 @@
+This test may fail if
+
+ - your /etc/services file is not in sync with what this test expects
+ - your /etc/hosts file or DNS have unusual entries for "localhost"
+   (a duplicate "localhost 127.0.0.1" line in /etc/hosts for example)
+
+On kernels without IPv6 support some of the tests are skipped.
diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/getaddrinfo/basics_v4.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/getaddrinfo/basics_v4.exp  Tue Jan 11 16:30:53 2011 +0000
@@ -0,0 +1,36 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/getaddrinfo/basics_v4v6.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/getaddrinfo/basics_v4v6.exp        Tue Jan 11 16:30:53 2011 +0000
@@ -0,0 +1,42 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
diff -r 4fac0e2a1f8d -r 9bd95d21bd08 tests/lib/libc/getaddrinfo/h_gai.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/getaddrinfo/h_gai.c        Tue Jan 11 16:30:53 2011 +0000
@@ -0,0 +1,186 @@
+/*     $NetBSD: h_gai.c,v 1.1 2011/01/11 16:30:53 pgoyette Exp $       */
+
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
+ * 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. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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 <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <arpa/inet.h>
+
+struct addrinfo ai;
+
+char host[NI_MAXHOST];
+char serv[NI_MAXSERV];
+int vflag = 0;
+
+static void usage(void);
+static void print1(const char *, const struct addrinfo *, char *, char *);
+int main(int, char *[]);
+
+static void
+usage()
+{
+       fprintf(stderr, "usage: test [-f family] [-s socktype] [-p proto] [-DPRSv46] host serv\n");
+}
+
+static void
+print1(const char *title, const struct addrinfo *res, char *h, char *s)
+{
+       const char *start, *end;
+       int error;
+       const int niflag = NI_NUMERICHOST;
+
+       if (res->ai_addr) {
+               error = getnameinfo(res->ai_addr, res->ai_addr->sa_len,
+                                   host, sizeof(host), serv, sizeof(serv),
+                                   niflag);
+               h = host;
+               s = serv;
+       } else
+               error = 0;
+
+       if (vflag) {
+               start = "\t";
+               end = "\n";
+       } else {
+               start = " ";
+               end = "";
+       }
+       printf("%s%s", title, end);
+       printf("%sflags 0x%x%s", start, res->ai_flags, end);
+       printf("%sfamily %d%s", start, res->ai_family, end);
+       printf("%ssocktype %d%s", start, res->ai_socktype, end);
+       printf("%sprotocol %d%s", start, res->ai_protocol, end);
+       printf("%saddrlen %d%s", start, res->ai_addrlen, end);
+       if (error)
+               printf("%serror %d%s", start, error, end);
+       else {
+               printf("%shost %s%s", start, h, end);
+               printf("%sserv %s%s", start, s, end);
+       }
+#if 0
+       if (res->ai_canonname)
+               printf("%scname \"%s\"%s", start, res->ai_canonname, end);
+#endif
+       if (!vflag)
+               printf("\n");
+
+}
+
+int
+main(int argc, char *argv[])
+{
+       struct addrinfo *res;
+       int error, i;
+       char *p, *q;
+       extern int optind;
+       extern char *optarg;
+       int c;
+       char nbuf[10];
+
+       memset(&ai, 0, sizeof(ai));
+       ai.ai_family = PF_UNSPEC;
+       ai.ai_flags |= AI_CANONNAME;
+       while ((c = getopt(argc, argv, "Df:p:PRs:Sv46")) != -1) {
+               switch (c) {
+               case 'D':
+                       ai.ai_socktype = SOCK_DGRAM;
+                       break;
+               case 'f':
+                       ai.ai_family = atoi(optarg);
+                       break;
+               case 'p':
+                       ai.ai_protocol = atoi(optarg);
+                       break;
+               case 'P':
+                       ai.ai_flags |= AI_PASSIVE;
+                       break;
+               case 'R':
+                       ai.ai_socktype = SOCK_RAW;
+                       break;
+               case 's':
+                       ai.ai_socktype = atoi(optarg);
+                       break;
+               case 'S':
+                       ai.ai_socktype = SOCK_STREAM;
+                       break;
+               case 'v':
+                       vflag++;
+                       break;
+               case '4':
+                       ai.ai_family = PF_INET;
+                       break;
+               case '6':
+                       ai.ai_family = PF_INET6;
+                       break;
+               default:
+                       usage();
+                       exit(1);



Home | Main Index | Thread Index | Old Index