Source-Changes-HG archive

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

[src/trunk]: src Test that reading a CTLTYPE_INT sysctl variable into a buffe...



details:   https://anonhg.NetBSD.org/src/rev/849b36c33f39
branches:  trunk
changeset: 798114:849b36c33f39
user:      gson <gson%NetBSD.org@localhost>
date:      Sat Aug 09 07:04:03 2014 +0000

description:
Test that reading a CTLTYPE_INT sysctl variable into a buffer that is
too small returns ENOMEM, and that reading it into a buffer that is
large enough returns the expected sizeof(int) bytes of data.

diffstat:

 distrib/sets/lists/debug/mi |   3 +-
 distrib/sets/lists/tests/mi |   3 +-
 tests/kernel/Makefile       |   3 +-
 tests/kernel/t_sysctl.c     |  74 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 3 deletions(-)

diffs (129 lines):

diff -r ece67b5e28c4 -r 849b36c33f39 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Sat Aug 09 05:33:00 2014 +0000
+++ b/distrib/sets/lists/debug/mi       Sat Aug 09 07:04:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.79 2014/08/08 19:54:14 apb Exp $
+# $NetBSD: mi,v 1.80 2014/08/09 07:04:03 gson Exp $
 
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib
@@ -1654,6 +1654,7 @@
 ./usr/libdata/debug/usr/tests/kernel/t_rnd.debug                       tests-kernel-tests      debug,atf,rump
 ./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug                 tests-obsolete          obsolete
 ./usr/libdata/debug/usr/tests/kernel/t_subr_prf.debug                  tests-kernel-tests      debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_sysctl.debug                    tests-kernel-tests      debug,atf
 ./usr/libdata/debug/usr/tests/kernel/t_sysv.debug                      tests-kernel-tests      debug,atf
 ./usr/libdata/debug/usr/tests/kernel/t_time.debug                      tests-obsolete          obsolete
 ./usr/libdata/debug/usr/tests/kernel/t_ucontext.debug                  tests-obsolete          obsolete
diff -r ece67b5e28c4 -r 849b36c33f39 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sat Aug 09 05:33:00 2014 +0000
+++ b/distrib/sets/lists/tests/mi       Sat Aug 09 07:04:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.583 2014/08/07 14:22:13 jmmv Exp $
+# $NetBSD: mi,v 1.584 2014/08/09 07:04:03 gson Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2093,6 +2093,7 @@
 ./usr/tests/kernel/t_rnd                       tests-kernel-tests              atf,rump
 ./usr/tests/kernel/t_sigaction                 tests-obsolete                  obsolete
 ./usr/tests/kernel/t_subr_prf                  tests-kernel-tests              atf
+./usr/tests/kernel/t_sysctl                    tests-kernel-tests              atf
 ./usr/tests/kernel/t_sysv                      tests-kernel-tests              atf
 ./usr/tests/kernel/t_time                      tests-obsolete                  obsolete
 ./usr/tests/kernel/t_ucontext                  tests-obsolete                  obsolete
diff -r ece67b5e28c4 -r 849b36c33f39 tests/kernel/Makefile
--- a/tests/kernel/Makefile     Sat Aug 09 05:33:00 2014 +0000
+++ b/tests/kernel/Makefile     Sat Aug 09 07:04:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.35 2014/08/09 07:04:03 gson Exp $
 
 NOMAN=         # defined
 
@@ -14,6 +14,7 @@
 TESTS_C+=      t_sysv
 TESTS_C+=      t_subr_prf
 TESTS_C+=      t_kauth_pr_47598
+TESTS_C+=      t_sysctl
 
 TESTS_SH=      t_umount
 TESTS_SH+=     t_umountstress
diff -r ece67b5e28c4 -r 849b36c33f39 tests/kernel/t_sysctl.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/t_sysctl.c   Sat Aug 09 07:04:03 2014 +0000
@@ -0,0 +1,74 @@
+/* $NetBSD: t_sysctl.c,v 1.1 2014/08/09 07:04:03 gson Exp $ */
+
+/*-
+ * Copyright (c) 2014 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) 2014\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sysctl.c,v 1.1 2014/08/09 07:04:03 gson Exp $");
+
+#include <sys/sysctl.h>
+#include <errno.h>
+#include <memory.h>
+
+#include <atf-c.h>
+
+ATF_TC(bufsize);
+ATF_TC_HEAD(bufsize, tc)
+{
+       atf_tc_set_md_var(tc, "descr",
+               "Test sysctl integer reads with different buffer sizes");
+}
+ATF_TC_BODY(bufsize, tc)
+{
+       union {
+               int int_val;
+               unsigned char space[256];
+       } buf;
+       size_t len;
+       for (len = 0; len < sizeof(buf); len++) {
+               size_t oldlen = len;
+               int r;
+               memset(&buf, 0xFF, sizeof(buf));
+               r = sysctlbyname("kern.job_control", &buf, &oldlen, 0, (size_t) 0);
+               if (len < sizeof(int)) {
+                       ATF_REQUIRE_EQ(r, -1);
+                       ATF_REQUIRE_EQ(errno, ENOMEM);
+               } else {
+                       ATF_REQUIRE_EQ(r, 0);
+                       ATF_REQUIRE_EQ(buf.int_val, 1);
+                       ATF_REQUIRE_EQ(oldlen, sizeof(int));
+               }
+       }
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+       ATF_TP_ADD_TC(tp, bufsize);
+
+       return atf_no_error();
+}



Home | Main Index | Thread Index | Old Index