Module Name: src
Committed By: pooka
Date: Mon May 31 23:36:12 UTC 2010
Modified Files:
src/tests/rump/rumpkern: Makefile
Added Files:
src/tests/rump/rumpkern: t_threads.c t_tsleep.c t_vm.c
Log Message:
add tests for:
* threading
* tsleep variants
* uvm page busying and wanting
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpkern/t_threads.c \
src/tests/rump/rumpkern/t_tsleep.c src/tests/rump/rumpkern/t_vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.6 src/tests/rump/rumpkern/Makefile:1.7
--- src/tests/rump/rumpkern/Makefile:1.6 Mon Jan 25 19:27:24 2010
+++ src/tests/rump/rumpkern/Makefile Mon May 31 23:36:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/25 19:27:24 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/31 23:36:12 pooka Exp $
.include <bsd.own.mk>
@@ -6,12 +6,18 @@
TESTS_C= t_modcmd
TESTS_C+= t_modlinkset
+TESTS_C+= t_threads
+TESTS_C+= t_tsleep
+TESTS_C+= t_vm
ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
LDADD+= ${ADD_TO_LD}
+KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR}
+LDADD+= -L${KERNSPACE} -lkernspace
+
WARNS= 4
.include <bsd.test.mk>
Added files:
Index: src/tests/rump/rumpkern/t_threads.c
diff -u /dev/null src/tests/rump/rumpkern/t_threads.c:1.1
--- /dev/null Mon May 31 23:36:12 2010
+++ src/tests/rump/rumpkern/t_threads.c Mon May 31 23:36:12 2010
@@ -0,0 +1,81 @@
+/* $NetBSD: t_threads.c,v 1.1 2010/05/31 23:36:12 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 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/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(threadjoin);
+ATF_TC_HEAD(threadjoin, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks joinable threads work");
+}
+
+ATF_TC_BODY(threadjoin, tc)
+{
+
+ rump_init();
+
+ rump_schedule();
+ rumptest_threadjoin(); /* panics if fails */
+ rump_unschedule();
+}
+
+ATF_TC(kthread);
+ATF_TC_HEAD(kthread, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks kthread_create/exit works");
+}
+
+ATF_TC_BODY(kthread, tc)
+{
+
+ rump_init();
+
+ rump_schedule();
+ rumptest_threadjoin(); /* panics if fails */
+ rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, threadjoin);
+ ATF_TP_ADD_TC(tp, kthread);
+
+ return atf_no_error();
+}
Index: src/tests/rump/rumpkern/t_tsleep.c
diff -u /dev/null src/tests/rump/rumpkern/t_tsleep.c:1.1
--- /dev/null Mon May 31 23:36:12 2010
+++ src/tests/rump/rumpkern/t_tsleep.c Mon May 31 23:36:12 2010
@@ -0,0 +1,63 @@
+/* $NetBSD: t_tsleep.c,v 1.1 2010/05/31 23:36:12 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 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/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(tsleep);
+ATF_TC_HEAD(tsleep, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Check tsleep variants");
+}
+
+ATF_TC_BODY(tsleep, tc)
+{
+
+ rump_init();
+
+ rump_schedule();
+ rumptest_tsleep(); /* panics if fails */
+ rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, tsleep);
+
+ return atf_no_error();
+}
Index: src/tests/rump/rumpkern/t_vm.c
diff -u /dev/null src/tests/rump/rumpkern/t_vm.c:1.1
--- /dev/null Mon May 31 23:36:12 2010
+++ src/tests/rump/rumpkern/t_vm.c Mon May 31 23:36:12 2010
@@ -0,0 +1,63 @@
+/* $NetBSD: t_vm.c,v 1.1 2010/05/31 23:36:12 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 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/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(busypage);
+ATF_TC_HEAD(busypage, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks VM pagewaits work");
+}
+
+ATF_TC_BODY(busypage, tc)
+{
+
+ rump_init();
+
+ rump_schedule();
+ rumptest_busypage();
+ rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, busypage);
+
+ return atf_no_error();
+}