svn commit: r366351 - head/contrib/netbsd-tests/fs

[Mitchell Horne]

Author: mhorne
Date: Fri Oct  2 00:52:31 2020
New Revision: 366351
URL: https://svnweb.freebsd.org/changeset/base/366351

Log:
  tmpfs tests: check for built-in tmpfs module
  
  As of r363471, tmpfs is included in all GENERIC kernel configs. This
  results in a warning being emitted for each call to kldload(8):
  
  module_register: cannot register tmpfs from tmpfs.ko; already loaded from kernel
  
  Check for the presence of the module via kldstat first to quiet this
  warning.
  
  Reviewed by:	asomers, arichardson
  Differential Revision:	https://reviews.freebsd.org/D26632

Modified:
  head/contrib/netbsd-tests/fs/h_funcs.subr

Modified: head/contrib/netbsd-tests/fs/h_funcs.subr
==============================================================================
--- head/contrib/netbsd-tests/fs/h_funcs.subr	Thu Oct  1 23:28:21 2020	(r366350)
+++ head/contrib/netbsd-tests/fs/h_funcs.subr	Fri Oct  2 00:52:31 2020	(r366351)
@@ -45,7 +45,7 @@ require_fs() {
 
 	# Begin FreeBSD
 	if true; then
-		if kldload -n ${name}; then
+		if kldstat -qm ${name} || kldload -n ${name}; then
 			found=yes
 		else
 			found=no