Module Name: src
Committed By: jruoho
Date: Tue Mar 20 05:50:11 UTC 2012
Modified Files:
src/tests/modules: t_abi_uvm.sh t_modload.sh
Log Message:
Skip Xen. XXX: There should be a reliable way to detect MODULAR.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_abi_uvm.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/modules/t_modload.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_abi_uvm.sh
diff -u src/tests/modules/t_abi_uvm.sh:1.1 src/tests/modules/t_abi_uvm.sh:1.2
--- src/tests/modules/t_abi_uvm.sh:1.1 Fri Feb 17 22:36:50 2012
+++ src/tests/modules/t_abi_uvm.sh Tue Mar 20 05:50:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_abi_uvm.sh,v 1.1 2012/02/17 22:36:50 jmmv Exp $
+# $NetBSD: t_abi_uvm.sh,v 1.2 2012/03/20 05:50:11 jruoho Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -31,6 +31,15 @@ PAGE_SIZE_head() {
atf_set "require.user" "root"
}
PAGE_SIZE_body() {
+
+ # XXX: There should be a reliable way to detect MODULAR.
+ #
+ sysctl machdep.xen > /dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ atf_skip "host does not support modules"
+ fi
+
if modload $(atf_get_srcdir)/k_uvm/k_uvm.kmod; then
:
else
Index: src/tests/modules/t_modload.sh
diff -u src/tests/modules/t_modload.sh:1.9 src/tests/modules/t_modload.sh:1.10
--- src/tests/modules/t_modload.sh:1.9 Thu Mar 24 21:52:51 2011
+++ src/tests/modules/t_modload.sh Tue Mar 20 05:50:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_modload.sh,v 1.9 2011/03/24 21:52:51 jmmv Exp $
+# $NetBSD: t_modload.sh,v 1.10 2012/03/20 05:50:11 jruoho Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,6 +36,15 @@ plain_head() {
atf_set "require.user" "root"
}
plain_body() {
+
+ # XXX: There should be a reliable way to detect MODULAR.
+ #
+ sysctl machdep.xen > /dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ atf_skip "host does not support modules"
+ fi
+
cat >experr <<EOF
modload: No such file or directory
EOF
@@ -99,6 +108,15 @@ iflag_head() {
atf_set "require.user" "root"
}
iflag_body() {
+
+ # XXX: There should be a reliable way to detect MODULAR.
+ #
+ sysctl machdep.xen > /dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ atf_skip "host does not support modules"
+ fi
+
echo "Checking error conditions"
atf_check -s eq:1 -o empty -e save:stderr modload -i foo \
@@ -143,6 +161,15 @@ sflag_head() {
atf_set "require.user" "root"
}
sflag_body() {
+
+ # XXX: There should be a reliable way to detect MODULAR.
+ #
+ sysctl machdep.xen > /dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ atf_skip "host does not support modules"
+ fi
+
echo "Checking error conditions"
atf_check -s eq:1 -o empty -e save:stderr modload -s foo \
