Module Name: src
Committed By: pooka
Date: Sat May 2 16:02:19 UTC 2009
Modified Files:
src/etc/mtree: NetBSD.dist
src/tests: Makefile
Added Files:
src/tests/rump: Atffile Makefile
src/tests/rump/rumpkern: Atffile Makefile t_modcmd.c
Log Message:
add regression test for module init/fini in rump
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.14 -r1.15 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/Atffile src/tests/rump/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpkern/Atffile \
src/tests/rump/rumpkern/Makefile src/tests/rump/rumpkern/t_modcmd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.398 src/etc/mtree/NetBSD.dist:1.399
--- src/etc/mtree/NetBSD.dist:1.398 Mon Apr 27 14:22:40 2009
+++ src/etc/mtree/NetBSD.dist Sat May 2 16:02:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.398 2009/04/27 14:22:40 njoly Exp $
+# $NetBSD: NetBSD.dist,v 1.399 2009/05/02 16:02:19 pooka Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -555,6 +555,8 @@
./usr/libdata/debug/usr/tests/modules
./usr/libdata/debug/usr/tests/net
./usr/libdata/debug/usr/tests/net/sys
+./usr/libdata/debug/usr/tests/rump
+./usr/libdata/debug/usr/tests/rump/rumpkern
./usr/libdata/debug/usr/tests/syscall
./usr/libdata/debug/usr/tests/util
./usr/libdata/debug/usr/tests/util/df
@@ -1425,6 +1427,8 @@
./usr/tests/modules
./usr/tests/net
./usr/tests/net/sys
+./usr/tests/rump
+./usr/tests/rump/rumpkern
./usr/tests/syscall
./usr/tests/util
./usr/tests/util/awk
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.14 src/tests/Makefile:1.15
--- src/tests/Makefile:1.14 Fri Feb 20 21:39:57 2009
+++ src/tests/Makefile Sat May 2 16:02:18 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/02/20 21:39:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/02 16:02:18 pooka Exp $
.include <bsd.own.mk>
-SUBDIR= crypto fs games ipf kernel net util syscall
+SUBDIR= crypto fs games ipf kernel net rump syscall util
.if ${MACHINE} != "evbppc"
SUBDIR+= modules
Added files:
Index: src/tests/rump/Atffile
diff -u /dev/null src/tests/rump/Atffile:1.1
--- /dev/null Sat May 2 16:02:19 2009
+++ src/tests/rump/Atffile Sat May 2 16:02:19 2009
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/05/02 16:02:19 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: *
Index: src/tests/rump/Makefile
diff -u /dev/null src/tests/rump/Makefile:1.1
--- /dev/null Sat May 2 16:02:19 2009
+++ src/tests/rump/Makefile Sat May 2 16:02:19 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/05/02 16:02:19 pooka Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/rump
+
+SUBDIR= rumpkern
+
+.include <bsd.test.mk>
+.include <bsd.subdir.mk>
Index: src/tests/rump/rumpkern/Atffile
diff -u /dev/null src/tests/rump/rumpkern/Atffile:1.1
--- /dev/null Sat May 2 16:02:19 2009
+++ src/tests/rump/rumpkern/Atffile Sat May 2 16:02:19 2009
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/05/02 16:02:19 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/rump/rumpkern/Makefile
diff -u /dev/null src/tests/rump/rumpkern/Makefile:1.1
--- /dev/null Sat May 2 16:02:19 2009
+++ src/tests/rump/rumpkern/Makefile Sat May 2 16:02:19 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/05/02 16:02:19 pooka Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/rump/rumpkern
+
+TESTS_C= t_modcmd
+
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
+
+.include <bsd.test.mk>
Index: src/tests/rump/rumpkern/t_modcmd.c
diff -u /dev/null src/tests/rump/rumpkern/t_modcmd.c:1.1
--- /dev/null Sat May 2 16:02:19 2009
+++ src/tests/rump/rumpkern/t_modcmd.c Sat May 2 16:02:19 2009
@@ -0,0 +1,109 @@
+/* $NetBSD: t_modcmd.c,v 1.1 2009/05/02 16:02:19 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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 <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "../../h_macros.h"
+
+/*
+ * We verify that modules can be loaded and unloaded.
+ * tmpfs was chosen because it does not depend on an image.
+ */
+
+ATF_TC(cmsg_modcmd);
+ATF_TC_HEAD(cmsg_modcmd, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks that loading and unloading "
+ "a module (vfs/tmpfs) is possible");
+}
+
+#define TMPFSMODULE "/usr/lib/librumpfs_tmpfs.so"
+ATF_TC_BODY(cmsg_modcmd, tc)
+{
+ struct tmpfs_args args;
+ struct modinfo **mi;
+ void *handle;
+ int rv;
+
+ rump_init();
+ memset(&args, 0, sizeof(args));
+ args.ta_version = TMPFS_ARGS_VERSION;
+ args.ta_root_mode = 0777;
+
+ if (rump_sys_mkdir("/mp", 0777) == -1)
+ atf_tc_fail_errno("mkdir mountpoint");
+ if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) != -1)
+ atf_tc_fail("mount unexpectedly succeeded");
+
+ handle = dlopen(TMPFSMODULE, RTLD_GLOBAL);
+ if (handle == NULL) {
+ const char *dlmsg = dlerror();
+ atf_tc_fail("cannot open %s: %s", TMPFSMODULE, dlmsg);
+ }
+ mi = dlsym(handle, "__start_link_set_modules");
+ if (mi == NULL)
+ atf_tc_fail("cannot find module info");
+ if ((rv = rump_module_init(*mi, NULL)) != 0)
+ atf_tc_fail("module init failed: %d (%s)", rv, strerror(rv));
+
+ if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("still cannot mount");
+ if (rump_sys_unmount("/mp", 0) == -1)
+ atf_tc_fail("cannot unmount");
+ if ((rv = rump_module_fini(*mi)) != 0)
+ atf_tc_fail("module fini failed: %d (%s)", rv, strerror(rv));
+ if (dlclose(handle)) {
+ const char *dlmsg = dlerror();
+ atf_tc_fail("cannot close %s: %s", TMPFSMODULE, dlmsg);
+ }
+
+ if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) != -1)
+ atf_tc_fail("mount unexpectedly succeeded");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, cmsg_modcmd);
+}
