Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Follow the design principles of tests(7) by merging 't_poll3...
details: https://anonhg.NetBSD.org/src/rev/a8b962f6c9c5
branches: trunk
changeset: 770378:a8b962f6c9c5
user: jruoho <jruoho%NetBSD.org@localhost>
date: Sat Oct 15 06:33:45 2011 +0000
description:
Follow the design principles of tests(7) by merging 't_poll3w' to 't_poll'
as a test case instead of separate file.
diffstat:
distrib/sets/lists/tests/mi | 6 +-
tests/kernel/Makefile | 3 +-
tests/kernel/t_poll3w.c | 148 --------------------------------------------
tests/lib/libc/sys/t_poll.c | 109 ++++++++++++++++++++++++++++++++-
4 files changed, 112 insertions(+), 154 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r 831289e63438 -r a8b962f6c9c5 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Sat Oct 15 06:26:33 2011 +0000
+++ b/distrib/sets/lists/tests/mi Sat Oct 15 06:33:45 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.404 2011/10/15 06:26:34 jruoho Exp $
+# $NetBSD: mi,v 1.405 2011/10/15 06:33:46 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -326,7 +326,7 @@
./usr/libdata/debug/usr/tests/kernel/t_lwpctl.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pipe.debug tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-kernel-tests debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pty.debug tests-kernel-tests debug,atf
@@ -1852,7 +1852,7 @@
./usr/tests/kernel/t_lwpctl tests-kernel-tests atf
./usr/tests/kernel/t_mkdir tests-obsolete obsolete
./usr/tests/kernel/t_pipe tests-obsolete obsolete
-./usr/tests/kernel/t_poll3w tests-kernel-tests atf
+./usr/tests/kernel/t_poll3w tests-obsolete obsolete
./usr/tests/kernel/t_pollts tests-obsolete obsolete
./usr/tests/kernel/t_posix_fadvise tests-obsolete obsolete
./usr/tests/kernel/t_ps_strings tests-kernel-tests atf
diff -r 831289e63438 -r a8b962f6c9c5 tests/kernel/Makefile
--- a/tests/kernel/Makefile Sat Oct 15 06:26:33 2011 +0000
+++ b/tests/kernel/Makefile Sat Oct 15 06:33:45 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/10/15 06:26:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.17 2011/10/15 06:33:45 jruoho Exp $
NOMAN= # defined
@@ -10,7 +10,6 @@
TESTS_C= t_lock
TESTS_C+= t_lwpctl
-TESTS_C+= t_poll3w
TESTS_C+= t_pty
TESTS_C+= t_rnd
TESTS_C+= t_time
diff -r 831289e63438 -r a8b962f6c9c5 tests/kernel/t_poll3w.c
--- a/tests/kernel/t_poll3w.c Sat Oct 15 06:26:33 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/* $NetBSD: t_poll3w.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
-
-/*-
- * Copyright (c) 2002, 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 <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_poll3w.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <poll.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <atf-c.h>
-
-#include "../h_macros.h"
-
-int desc;
-
-static void
-child1(void)
-{
- struct pollfd pfd;
-
- pfd.fd = desc;
- pfd.events = POLLIN | POLLHUP | POLLOUT;
-
- (void)poll(&pfd, 1, 2000);
- (void)printf("child1 exit\n");
-}
-
-static void
-child2(void)
-{
- struct pollfd pfd;
-
- pfd.fd = desc;
- pfd.events = POLLIN | POLLHUP | POLLOUT;
-
- (void)sleep(1);
- (void)poll(&pfd, 1, INFTIM);
- (void)printf("child2 exit\n");
-}
-
-static void
-child3(void)
-{
- struct pollfd pfd;
-
- (void)sleep(5);
-
- pfd.fd = desc;
- pfd.events = POLLIN | POLLHUP | POLLOUT;
-
- (void)poll(&pfd, 1, INFTIM);
- (void)printf("child3 exit\n");
-}
-
-ATF_TC(poll);
-ATF_TC_HEAD(poll, tc)
-{
- atf_tc_set_md_var(tc, "timeout", "15");
- atf_tc_set_md_var(tc, "descr",
- "Check for 3-way collision for descriptor. First child comes "
- "and polls on descriptor, second child comes and polls, first "
- "child times out and exits, third child comes and polls. When "
- "the wakeup event happens, the two remaining children should "
- "both be awaken. (kern/17517)");
-}
-ATF_TC_BODY(poll, tc)
-{
- int pf[2];
- int status, i;
- pid_t pid;
-
- pipe(pf);
- desc = pf[0];
-
- RL((pid = fork()));
- if (pid == 0) {
- (void)close(pf[1]);
- child1();
- _exit(0);
- /* NOTREACHED */
- }
-
- RL((pid = fork()));
- if (pid == 0) {
- (void)close(pf[1]);
- child2();
- _exit(0);
- /* NOTREACHED */
- }
-
- RL((pid = fork()));
- if (pid == 0) {
- (void)close(pf[1]);
- child3();
- _exit(0);
- /* NOTREACHED */
- }
-
- (void)sleep(10);
-
- (void)printf("parent write\n");
-
- RL(write(pf[1], "konec\n", 6));
-
- for(i = 0; i < 3; ++i)
- RL(wait(&status));
-
- (void)printf("parent terminated\n");
-}
-
-ATF_TP_ADD_TCS(tp)
-{
- ATF_TP_ADD_TC(tp, poll);
-
- return atf_no_error();
-}
diff -r 831289e63438 -r a8b962f6c9c5 tests/lib/libc/sys/t_poll.c
--- a/tests/lib/libc/sys/t_poll.c Sat Oct 15 06:26:33 2011 +0000
+++ b/tests/lib/libc/sys/t_poll.c Sat Oct 15 06:33:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_poll.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
+/* $NetBSD: t_poll.c,v 1.2 2011/10/15 06:33:45 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,15 +30,121 @@
*/
#include <sys/time.h>
+#include <sys/wait.h>
#include <atf-c.h>
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
#include <poll.h>
+#include <stdio.h>
#include <signal.h>
#include <unistd.h>
+static int desc;
+
+static void
+child1(void)
+{
+ struct pollfd pfd;
+
+ pfd.fd = desc;
+ pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+ (void)poll(&pfd, 1, 2000);
+ (void)printf("child1 exit\n");
+}
+
+static void
+child2(void)
+{
+ struct pollfd pfd;
+
+ pfd.fd = desc;
+ pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+ (void)sleep(1);
+ (void)poll(&pfd, 1, INFTIM);
+ (void)printf("child2 exit\n");
+}
+
+static void
+child3(void)
+{
+ struct pollfd pfd;
+
+ (void)sleep(5);
+
+ pfd.fd = desc;
+ pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+ (void)poll(&pfd, 1, INFTIM);
+ (void)printf("child3 exit\n");
+}
+
+ATF_TC(poll_3way);
+ATF_TC_HEAD(poll_3way, tc)
+{
+ atf_tc_set_md_var(tc, "timeout", "15");
+ atf_tc_set_md_var(tc, "descr",
+ "Check for 3-way collision for descriptor. First child comes "
+ "and polls on descriptor, second child comes and polls, first "
+ "child times out and exits, third child comes and polls. When "
+ "the wakeup event happens, the two remaining children should "
+ "both be awaken. (kern/17517)");
+}
+
+ATF_TC_BODY(poll_3way, tc)
+{
+ int pf[2];
+ int status, i;
+ pid_t pid;
+
+ pipe(pf);
+ desc = pf[0];
+
+ pid = fork();
+ ATF_REQUIRE(pid >= 0);
+
+ if (pid == 0) {
+ (void)close(pf[1]);
+ child1();
+ _exit(0);
+ /* NOTREACHED */
+ }
+
+ pid = fork();
+ ATF_REQUIRE(pid >= 0);
+
+ if (pid == 0) {
+ (void)close(pf[1]);
+ child2();
+ _exit(0);
+ /* NOTREACHED */
Home |
Main Index |
Thread Index |
Old Index