Module Name: src
Committed By: pooka
Date: Thu Sep 24 21:36:43 UTC 2009
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/rump/rumpkern: Atffile Makefile
Added Files:
src/tests/rump/rumpkern: t_modlinkset.c
Log Message:
Add regression test to verify that linksets work correctly with rump.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/Atffile
cvs rdiff -u -r1.2 -r1.3 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpkern/t_modlinkset.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.50 src/distrib/sets/lists/tests/mi:1.51
--- src/distrib/sets/lists/tests/mi:1.50 Thu Sep 24 21:33:45 2009
+++ src/distrib/sets/lists/tests/mi Thu Sep 24 21:36:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.50 2009/09/24 21:33:45 pooka Exp $
+# $NetBSD: mi,v 1.51 2009/09/24 21:36:42 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -151,6 +151,7 @@
./usr/libdata/debug/usr/tests/rump tests-syscall-debug
./usr/libdata/debug/usr/tests/rump/rumpkern tests-syscall-debug
./usr/libdata/debug/usr/tests/rump/rumpkern/t_modcmd.debug tests-syscall-debug debug
+./usr/libdata/debug/usr/tests/rump/rumpkern/t_modlinkset.debug tests-syscall-debug debug
./usr/libdata/debug/usr/tests/syscall tests-syscall-debug
./usr/libdata/debug/usr/tests/syscall/t_cmsg.debug tests-syscall-debug debug
./usr/libdata/debug/usr/tests/util tests-util-debug
@@ -874,6 +875,7 @@
./usr/tests/rump/rumpkern tests-rump-tests
./usr/tests/rump/rumpkern/Atffile tests-rump-tests
./usr/tests/rump/rumpkern/t_modcmd tests-rump-tests
+./usr/tests/rump/rumpkern/t_modlinkset tests-rump-tests
./usr/tests/syscall tests-syscall-tests
./usr/tests/syscall/Atffile tests-syscall-tests
./usr/tests/syscall/t_cmsg tests-syscall-tests
Index: src/tests/rump/rumpkern/Atffile
diff -u src/tests/rump/rumpkern/Atffile:1.1 src/tests/rump/rumpkern/Atffile:1.2
--- src/tests/rump/rumpkern/Atffile:1.1 Sat May 2 16:02:19 2009
+++ src/tests/rump/rumpkern/Atffile Thu Sep 24 21:36:42 2009
@@ -1,5 +1,5 @@
Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/05/02 16:02:19 pooka Exp $"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2009/09/24 21:36:42 pooka Exp $"
prop: test-suite = "NetBSD"
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.2 src/tests/rump/rumpkern/Makefile:1.3
--- src/tests/rump/rumpkern/Makefile:1.2 Tue Jun 9 11:18:50 2009
+++ src/tests/rump/rumpkern/Makefile Thu Sep 24 21:36:42 2009
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 11:18:50 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/24 21:36:42 pooka Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/rump/rumpkern
TESTS_C= t_modcmd
+TESTS_C+= t_modlinkset
-LDADD+= -lrump -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_modlinkset+= -lukfs -lrumpfs_cd9660 -lrumpfs_msdos
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
.include <bsd.test.mk>
Added files:
Index: src/tests/rump/rumpkern/t_modlinkset.c
diff -u /dev/null src/tests/rump/rumpkern/t_modlinkset.c:1.1
--- /dev/null Thu Sep 24 21:36:43 2009
+++ src/tests/rump/rumpkern/t_modlinkset.c Thu Sep 24 21:36:42 2009
@@ -0,0 +1,71 @@
+/* $NetBSD: t_modlinkset.c,v 1.1 2009/09/24 21:36:42 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/ukfs.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(modlinkset);
+ATF_TC_HEAD(modlinkset, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Check that module linkset bootstrap "
+ "works");
+}
+
+/*
+ * We link against cd9660 and msdosfs (both chosed because the names
+ * are unlikely to ever be a substring of a another file system).
+ * Without proper linkset handling at most one will be reported.
+ */
+ATF_TC_BODY(modlinkset, tc)
+{
+ char buf[1024];
+
+ rump_init();
+ if (ukfs_vfstypes(buf, sizeof(buf)) == -1)
+ atf_tc_fail_errno("ukfs_vfstypes");
+
+ ATF_CHECK((strstr(buf, "msdos") != NULL));
+ ATF_CHECK((strstr(buf, "cd9660") != NULL));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, modlinkset);
+}
