Source-Changes-HG archive

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

[src/trunk]: src/tests/lib/libc/sys Move all pipe2 tests to a separate file.



details:   https://anonhg.NetBSD.org/src/rev/c7b9d99abf75
branches:  trunk
changeset: 770747:c7b9d99abf75
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 31 15:41:31 2011 +0000

description:
Move all pipe2 tests to a separate file.

diffstat:

 tests/lib/libc/sys/Makefile  |    3 +-
 tests/lib/libc/sys/t_pipe.c  |   29 +--------
 tests/lib/libc/sys/t_pipe2.c |  136 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 28 deletions(-)

diffs (210 lines):

diff -r ff52727e1625 -r c7b9d99abf75 tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile       Mon Oct 31 15:37:17 2011 +0000
+++ b/tests/lib/libc/sys/Makefile       Mon Oct 31 15:41:31 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/10/15 07:00:48 jruoho Exp $
+# $NetBSD: Makefile,v 1.17 2011/10/31 15:41:31 christos Exp $
 
 MKMAN= no
 
@@ -34,6 +34,7 @@
 TESTS_C+=              t_msync
 TESTS_C+=              t_nanosleep
 TESTS_C+=              t_pipe
+TESTS_C+=              t_pipe2
 TESTS_C+=              t_posix_fadvise
 TESTS_C+=              t_poll
 TESTS_C+=              t_revoke
diff -r ff52727e1625 -r c7b9d99abf75 tests/lib/libc/sys/t_pipe.c
--- a/tests/lib/libc/sys/t_pipe.c       Mon Oct 31 15:37:17 2011 +0000
+++ b/tests/lib/libc/sys/t_pipe.c       Mon Oct 31 15:41:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe.c,v 1.2 2011/10/20 18:20:30 njoly Exp $ */
+/* $NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $ */
 
 /*-
  * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_pipe.c,v 1.2 2011/10/20 18:20:30 njoly Exp $");
+__RCSID("$NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -155,34 +155,9 @@
        }
 }
 
-ATF_TC(pipe2_cloexec);
-ATF_TC_HEAD(pipe2_cloexec, tc)
-{
-       atf_tc_set_md_var(tc, "descr", "Check pipe2(2) with O_CLOEXEC");
-}
-
-ATF_TC_BODY(pipe2_cloexec, tc)
-{
-       int flag, fildes[2];
-
-       ATF_REQUIRE(pipe2(fildes, O_CLOEXEC) != -1);
-
-       flag = fcntl(fildes[0], F_GETFD);
-       ATF_REQUIRE(flag != -1);
-       ATF_CHECK((flag & FD_CLOEXEC) != 0);
-
-       flag = fcntl(fildes[1], F_GETFD);
-       ATF_REQUIRE(flag != -1);
-       ATF_CHECK((flag & FD_CLOEXEC) != 0);
-
-       ATF_REQUIRE(close(fildes[0]) != -1);
-       ATF_REQUIRE(close(fildes[1]) != -1);
-}
-
 ATF_TP_ADD_TCS(tp)
 {
        ATF_TP_ADD_TC(tp, pipe_restart);
-       ATF_TP_ADD_TC(tp, pipe2_cloexec);
 
        return atf_no_error();
 }
diff -r ff52727e1625 -r c7b9d99abf75 tests/lib/libc/sys/t_pipe2.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/sys/t_pipe2.c      Mon Oct 31 15:41:31 2011 +0000
@@ -0,0 +1,136 @@
+/* $NetBSD: t_pipe2.c,v 1.1 2011/10/31 15:41:31 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 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>
+__RCSID("$NetBSD: t_pipe2.c,v 1.1 2011/10/31 15:41:31 christos Exp $");
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+
+static void
+run(int flags)
+{
+       int fd[2], i;
+
+       while ((i = open("/", O_RDONLY < 3)) < 3)
+               ATF_REQUIRE(i != -1);
+
+       ATF_REQUIRE(fcntl(3, F_CLOSEM) != -1);
+
+       ATF_REQUIRE(pipe2(fd, 0) == 0);
+
+       ATF_REQUIRE(fd[0] == 3);
+       ATF_REQUIRE(fd[1] == 4);
+
+       if (flags & O_CLOEXEC) {
+               ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) != 0);
+               ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) != 0);
+       } else {
+               ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) == 0);
+               ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) == 0);
+       }
+
+       if (flags & O_CLOEXEC) {
+               ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) != 0);
+               ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) != 0);
+       } else {
+               ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) == 0);
+               ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) == 0);
+       }
+
+       ATF_REQUIRE(close(fd[0]) != -1);
+       ATF_REQUIRE(close(fd[1]) != -1);
+}
+
+ATF_TC(pipe2_basic);
+ATF_TC_HEAD(pipe2_basic, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "A basic test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_basic, tc)
+{
+       run(0);
+}
+
+ATF_TC(pipe2_nonblock);
+ATF_TC_HEAD(pipe2_nonblock, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "A non-blocking test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_nonblock, tc)
+{
+       run(O_NONBLOCK);
+}
+
+ATF_TC(pipe2_cloexec);
+ATF_TC_HEAD(pipe2_cloexec, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "A close-on-exec of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_cloexec, tc)
+{
+       run(O_CLOEXEC);
+}
+
+ATF_TC(pipe2_einval);
+ATF_TC_HEAD(pipe2_einval, tc)
+{
+       atf_tc_set_md_var(tc, "descr", "A error check of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_einval, tc)
+{
+       int fd[2];
+       ATF_REQUIRE_ERRNO(EINVAL, pipe2(fd, O_ASYNC) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+       ATF_TP_ADD_TC(tp, pipe2_basic);
+       ATF_TP_ADD_TC(tp, pipe2_nonblock);
+       ATF_TP_ADD_TC(tp, pipe2_cloexec);
+       ATF_TP_ADD_TC(tp, pipe2_einval);
+
+       return atf_no_error();
+}



Home | Main Index | Thread Index | Old Index