Module Name: src
Committed By: jruoho
Date: Thu Jul 7 07:06:21 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_getcontext.c
Removed Files:
src/tests/lib/libc/sys: t_cerror.c t_context.c
Log Message:
Remove 't_cerror' (this is tested by numerous individual tests).
Rename 't_context' to 't_getcontext' for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/sys/t_cerror.c \
src/tests/lib/libc/sys/t_context.c
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_getcontext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.366 src/distrib/sets/lists/tests/mi:1.367
--- src/distrib/sets/lists/tests/mi:1.366 Thu Jul 7 06:58:53 2011
+++ src/distrib/sets/lists/tests/mi Thu Jul 7 07:06:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.366 2011/07/07 06:58:53 jruoho Exp $
+# $NetBSD: mi,v 1.367 2011/07/07 07:06:21 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -459,12 +459,13 @@
./usr/libdata/debug/usr/tests/lib/libc/string/t_swab.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/sys/t_access.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/sys/t_cerror.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_cerror.debug tests-obsolete obsolete
./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_clone.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/sys/t_context.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
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_getcontext.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_getgroups.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_getitimer.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_getlogin.debug tests-lib-debug debug,atf
@@ -2029,12 +2030,13 @@
./usr/tests/lib/libc/sys tests-lib-tests
./usr/tests/lib/libc/sys/Atffile tests-lib-tests atf
./usr/tests/lib/libc/sys/t_access tests-lib-tests atf
-./usr/tests/lib/libc/sys/t_cerror tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_cerror tests-obsolete obsolete
./usr/tests/lib/libc/sys/t_chroot tests-lib-tests atf
./usr/tests/lib/libc/sys/t_clone tests-lib-tests atf
-./usr/tests/lib/libc/sys/t_context 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
+./usr/tests/lib/libc/sys/t_getcontext tests-lib-tests atf
./usr/tests/lib/libc/sys/t_getgroups tests-lib-tests atf
./usr/tests/lib/libc/sys/t_getitimer tests-lib-tests atf
./usr/tests/lib/libc/sys/t_getlogin tests-lib-tests atf
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.4 src/tests/lib/libc/sys/Makefile:1.5
--- src/tests/lib/libc/sys/Makefile:1.4 Thu Jul 7 06:57:53 2011
+++ src/tests/lib/libc/sys/Makefile Thu Jul 7 07:06:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/07 06:57:53 jruoho Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/07 07:06:21 jruoho Exp $
MKMAN= no
@@ -7,12 +7,11 @@
TESTSDIR= ${TESTSBASE}/lib/libc/sys
TESTS_C+= t_access
-TESTS_C+= t_cerror
TESTS_C+= t_chroot
TESTS_C+= t_clone
-TESTS_C+= t_context
TESTS_C+= t_dup
TESTS_C+= t_fsync
+TESTS_C+= t_getcontext
TESTS_C+= t_getgroups
TESTS_C+= t_getitimer
TESTS_C+= t_getlogin
Added files:
Index: src/tests/lib/libc/sys/t_getcontext.c
diff -u /dev/null src/tests/lib/libc/sys/t_getcontext.c:1.1
--- /dev/null Thu Jul 7 07:06:21 2011
+++ src/tests/lib/libc/sys/t_getcontext.c Thu Jul 7 07:06:21 2011
@@ -0,0 +1,101 @@
+/* $NetBSD: t_getcontext.c,v 1.1 2011/07/07 07:06:21 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 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_getcontext.c,v 1.1 2011/07/07 07:06:21 jruoho Exp $");
+
+#include <ucontext.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+#define STACKSZ (10*1024)
+#define DEPTH 3
+
+static int calls;
+
+static void
+run(int n, ...)
+{
+ va_list va;
+ int i, ia;
+
+ ATF_REQUIRE_EQ(n, DEPTH - calls - 1);
+
+ va_start(va, n);
+ for (i = 0; i < 9; i++) {
+ ia = va_arg(va, int);
+ ATF_REQUIRE_EQ(i, ia);
+ }
+ va_end(va);
+
+ calls++;
+}
+
+ATF_TC(getcontext_link);
+ATF_TC_HEAD(getcontext_link, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr",
+ "Checks get/make/setcontext(), context linking via uc_link(), "
+ "and argument passing to the new context");
+}
+
+ATF_TC_BODY(getcontext_link, tc)
+{
+ ucontext_t uc[DEPTH];
+ ucontext_t save;
+ volatile int i = 0; /* avoid longjmp clobbering */
+
+ for (i = 0; i < DEPTH; ++i) {
+ ATF_REQUIRE_EQ(getcontext(&uc[i]), 0);
+
+ uc[i].uc_stack.ss_sp = malloc(STACKSZ);
+ uc[i].uc_stack.ss_size = STACKSZ;
+ uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save;
+
+ makecontext(&uc[i], (void *)run, 10, i,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8);
+ }
+
+ ATF_REQUIRE_EQ(getcontext(&save), 0);
+
+ if (calls == 0)
+ ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, getcontext_link);
+
+ return atf_no_error();
+}
