Index: stable/11/contrib/netbsd-tests/fs/h_funcs.subr
===================================================================
--- stable/11/contrib/netbsd-tests/fs/h_funcs.subr	(revision 339049)
+++ stable/11/contrib/netbsd-tests/fs/h_funcs.subr	(revision 339050)
@@ -1,75 +1,75 @@
 #!/bin/sh
 #
 # $NetBSD: h_funcs.subr,v 1.3 2010/06/23 11:19:17 pooka Exp $
 #
 # Copyright (c) 2007 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.
 #
 
 #
 # require_fs name
 #
 #	Checks that the given file system is built into the kernel and
 #	that its corresponding mount(8) utility is available.  Otherwise
 #	skips the test.
 #
 require_fs() {
 	local name
 	local autoload
 	name="${1}"
 
 	atf_require_prog mount
 	atf_require_prog mount_${name}
 	atf_require_prog umount
 
-	# if we have autoloadable modules, just assume the file system
-	atf_require_prog sysctl
 	# Begin FreeBSD
 	if true; then
-		if kldstat -m ${name}; then
+		if kldload -n ${name}; then
 			found=yes
 		else
 			found=no
 		fi
 	else
 	# End FreeBSD
+	# if we have autoloadable modules, just assume the file system
+	atf_require_prog sysctl
 	autoload=$(sysctl -n kern.module.autoload)
 	[ "${autoload}" = "1" ] && return 0
 
 	set -- $(sysctl -n vfs.generic.fstypes)
 	found=no
 	while [ ${#} -gt 1 ];  do
 		if [ ${1} = ${name} ]; then
 			found=yes
 			break
 		fi
 		shift
 	done
 	# Begin FreeBSD
 	fi
 	# End FreeBSD
 	[ ${found} = yes ] || \
 		atf_skip "The kernel does not include support the " \
 		         "\`${name}' file system"
 }
Index: stable/11
===================================================================
--- stable/11	(revision 339049)
+++ stable/11	(revision 339050)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r336594