Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move connect(2), listen(2) and socketpair(2) tests to the ri...
details: https://anonhg.NetBSD.org/src/rev/7c61962d67ed
branches: trunk
changeset: 770995:7c61962d67ed
user: jruoho <jruoho%NetBSD.org@localhost>
date: Sat Nov 05 18:19:01 2011 +0000
description:
Move connect(2), listen(2) and socketpair(2) tests to the right place.
diffstat:
distrib/sets/lists/tests/mi | 20 +++-
tests/lib/libc/sys/Makefile | 5 +-
tests/lib/libc/sys/t_connect.c | 99 +++++++++++++++++++++++++++
tests/lib/libc/sys/t_listen.c | 74 ++++++++++++++++++++
tests/lib/libc/sys/t_socketpair.c | 137 ++++++++++++++++++++++++++++++++++++++
tests/net/sys/Makefile | 7 +-
tests/net/sys/t_connect.c | 98 ---------------------------
tests/net/sys/t_listen.c | 72 -------------------
tests/net/sys/t_socketpair.c | 137 --------------------------------------
9 files changed, 330 insertions(+), 319 deletions(-)
diffs (truncated from 778 to 300 lines):
diff -r a495776f3607 -r 7c61962d67ed distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Sat Nov 05 18:17:29 2011 +0000
+++ b/distrib/sets/lists/tests/mi Sat Nov 05 18:19:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.416 2011/11/05 18:07:15 jruoho Exp $
+# $NetBSD: mi,v 1.417 2011/11/05 18:19:02 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -492,6 +492,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_chroot.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_clock_gettime.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_clone.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_connect.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_context.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc/sys/t_dup.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_fsync.debug tests-lib-debug debug,atf
@@ -506,6 +507,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_issetugid.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_kill.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_link.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_listen.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mincore.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkdir.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkfifo.debug tests-lib-debug debug,atf
@@ -528,6 +530,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_setuid.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigaction.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigqueue.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_socketpair.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_stat.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_timer_create.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_truncate.debug tests-lib-debug debug,atf
@@ -681,10 +684,10 @@
./usr/libdata/debug/usr/tests/net/net/t_raw.debug tests-net-debug debug,atf
./usr/libdata/debug/usr/tests/net/net/t_unix.debug tests-net-debug debug,atf
./usr/libdata/debug/usr/tests/net/sys tests-net-debug
-./usr/libdata/debug/usr/tests/net/sys/t_connect.debug tests-net-debug debug,atf
-./usr/libdata/debug/usr/tests/net/sys/t_listen.debug tests-net-debug debug,atf
+./usr/libdata/debug/usr/tests/net/sys/t_connect.debug tests-obsolete obsolete
+./usr/libdata/debug/usr/tests/net/sys/t_listen.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/net/sys/t_rfc6056.debug tests-net-debug debug,atf
-./usr/libdata/debug/usr/tests/net/sys/t_socketpair.debug tests-net-debug debug,atf
+./usr/libdata/debug/usr/tests/net/sys/t_socketpair.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/rump tests-syscall-debug
./usr/libdata/debug/usr/tests/rump/modautoload tests-syscall-debug
./usr/libdata/debug/usr/tests/rump/modautoload/t_modautoload.debug tests-syscall-debug debug,atf
@@ -2123,6 +2126,7 @@
./usr/tests/lib/libc/sys/t_chroot tests-lib-tests atf
./usr/tests/lib/libc/sys/t_clock_gettime tests-lib-tests atf
./usr/tests/lib/libc/sys/t_clone tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_connect tests-lib-tests atf
./usr/tests/lib/libc/sys/t_context tests-obsolete obsolete
./usr/tests/lib/libc/sys/t_dup tests-lib-tests atf
./usr/tests/lib/libc/sys/t_fsync tests-lib-tests atf
@@ -2137,6 +2141,7 @@
./usr/tests/lib/libc/sys/t_issetugid tests-lib-tests atf
./usr/tests/lib/libc/sys/t_kill tests-lib-tests atf
./usr/tests/lib/libc/sys/t_link tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_listen tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mincore tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mkdir tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mkfifo tests-lib-tests atf
@@ -2159,6 +2164,7 @@
./usr/tests/lib/libc/sys/t_setuid tests-lib-tests atf
./usr/tests/lib/libc/sys/t_sigaction tests-lib-tests atf
./usr/tests/lib/libc/sys/t_sigqueue tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_socketpair tests-lib-tests atf
./usr/tests/lib/libc/sys/t_stat tests-lib-tests atf
./usr/tests/lib/libc/sys/t_timer_create tests-lib-tests atf
./usr/tests/lib/libc/sys/t_truncate tests-lib-tests atf
@@ -2487,10 +2493,10 @@
./usr/tests/net/route/t_change tests-net-tests atf
./usr/tests/net/sys tests-net-tests
./usr/tests/net/sys/Atffile tests-net-tests atf
-./usr/tests/net/sys/t_connect tests-net-tests atf
-./usr/tests/net/sys/t_listen tests-net-tests atf
+./usr/tests/net/sys/t_connect tests-obsolete obsolete
+./usr/tests/net/sys/t_listen tests-obsolete obsolete
./usr/tests/net/sys/t_rfc6056 tests-net-tests atf
-./usr/tests/net/sys/t_socketpair tests-net-tests atf
+./usr/tests/net/sys/t_socketpair tests-obsolete obsolete
./usr/tests/rump tests-rump-tests
./usr/tests/rump/Atffile tests-rump-tests atf
./usr/tests/rump/modautoload tests-rump-tests
diff -r a495776f3607 -r 7c61962d67ed tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile Sat Nov 05 18:17:29 2011 +0000
+++ b/tests/lib/libc/sys/Makefile Sat Nov 05 18:19:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/11/05 07:45:41 jruoho Exp $
+# $NetBSD: Makefile,v 1.19 2011/11/05 18:19:01 jruoho Exp $
MKMAN= no
@@ -12,6 +12,7 @@
TESTS_C+= t_chroot
TESTS_C+= t_clock_gettime
TESTS_C+= t_clone
+TESTS_C+= t_connect
TESTS_C+= t_dup
TESTS_C+= t_fsync
TESTS_C+= t_getcontext
@@ -25,6 +26,7 @@
TESTS_C+= t_issetugid
TESTS_C+= t_kill
TESTS_C+= t_link
+TESTS_C+= t_listen
TESTS_C+= t_mincore
TESTS_C+= t_mkdir
TESTS_C+= t_mkfifo
@@ -47,6 +49,7 @@
TESTS_C+= t_setuid
TESTS_C+= t_sigaction
TESTS_C+= t_sigqueue
+TESTS_C+= t_socketpair
TESTS_C+= t_stat
TESTS_C+= t_timer_create
TESTS_C+= t_truncate
diff -r a495776f3607 -r 7c61962d67ed tests/lib/libc/sys/t_connect.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/sys/t_connect.c Sat Nov 05 18:19:01 2011 +0000
@@ -0,0 +1,99 @@
+/* $NetBSD: t_connect.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $ */
+/*
+ * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+ * 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.
+ *
+ * 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 <err.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include <atf-c.h>
+
+ATF_TC(connect_low_port);
+ATF_TC_HEAD(connect_low_port, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks that low-port allocation "
+ "works");
+ atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(connect_low_port, tc)
+{
+ struct sockaddr_in sin, sinlist;
+ int sd, val, slist;
+ socklen_t slen;
+
+ slist = socket(AF_INET, SOCK_STREAM, 0);
+ sd = socket(AF_INET, SOCK_STREAM, 0);
+
+ /* bind listening socket */
+ memset(&sinlist, 0, sizeof(sinlist));
+ sinlist.sin_family = AF_INET;
+ sinlist.sin_port = htons(31522);
+ sinlist.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+ ATF_REQUIRE_EQ(bind(slist,
+ (struct sockaddr *)&sinlist, sizeof(sinlist)), 0);
+ ATF_REQUIRE_EQ(listen(slist, 1), 0);
+
+ val = IP_PORTRANGE_LOW;
+ if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, &val,
+ sizeof(val)) == -1)
+ atf_tc_fail("setsockopt failed: %s", strerror(errno));
+
+ memset(&sin, 0, sizeof(sin));
+
+ sin.sin_port = htons(31522);
+ sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+ sin.sin_family = AF_INET;
+
+ if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
+ int serrno = errno;
+ atf_tc_fail("connect failed: %s%s",
+ strerror(serrno),
+ serrno != EACCES ? "" :
+ " (see http://mail-index.netbsd.org/";
+ "source-changes/2007/12/16/0011.html)");
+ }
+
+ slen = sizeof(sin);
+ ATF_REQUIRE_EQ(getsockname(sd, (struct sockaddr *)&sin, &slen), 0);
+ ATF_REQUIRE_EQ(slen, sizeof(sin));
+ ATF_REQUIRE(ntohs(sin.sin_port) <= IPPORT_RESERVEDMAX);
+
+ close(sd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, connect_low_port);
+
+ return atf_no_error();
+}
diff -r a495776f3607 -r 7c61962d67ed tests/lib/libc/sys/t_listen.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/sys/t_listen.c Sat Nov 05 18:19:01 2011 +0000
@@ -0,0 +1,74 @@
+/* $NetBSD: t_listen.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $ */
+/*
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * 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.
+ *
+ * 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 <err.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+
+#include <atf-c.h>
+
+ATF_TC(listen_low_port);
+ATF_TC_HEAD(listen_low_port, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks that low-port allocation "
+ "works");
+ atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(listen_low_port, tc)
+{
+ int sd, val;
+
+ sd = socket(AF_INET, SOCK_STREAM, 0);
+
+ val = IP_PORTRANGE_LOW;
+ if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, &val,
+ sizeof(val)) == -1)
+ atf_tc_fail("setsockopt failed: %s", strerror(errno));
+
+ if (listen(sd, 5) == -1) {
+ int serrno = errno;
+ atf_tc_fail("listen failed: %s%s",
+ strerror(serrno),
+ serrno != EACCES ? "" :
+ " (see http://mail-index.netbsd.org/";
+ "source-changes/2007/12/16/0011.html)");
+ }
+
+ close(sd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, listen_low_port);
+
+ return 0;
+}
diff -r a495776f3607 -r 7c61962d67ed tests/lib/libc/sys/t_socketpair.c
Home |
Main Index |
Thread Index |
Old Index