d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tmpfs detection in the sys/fs/tmpfs tests

Browse Source 
This code was originally written for NetBSD.  r306031 tried to adapt it to
FreeBSD, but didn't correctly handle the case that tmpfs was available, but
not already loaded.  Fix the logic to load the module if necessary.  The
tmpfs tests shouldn't be skipped anymore.

Also, fix a comment that was dislocated by r306031.

Reported by:	Jenkins
MFC after:	2 weeks
This commit is contained in:
asomers 2018-07-21 23:54:40 +00:00
parent 9d29e641f7
commit f2573d2e4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/netbsd-tests/fs/h_funcs.subr
View File

@ -43,17 +43,17 @@ require_fs() {
atf_require_prog mount_${name} atf_require_prog mount_${name}
atf_require_prog umount atf_require_prog umount
# if we have autoloadable modules, just assume the file system
atf_require_prog sysctl
# Begin FreeBSD # Begin FreeBSD
if true; then if true; then
if kldstat -m ${name}; then if kldload -n ${name}; then
found=yes found=yes
else else
found=no found=no
fi fi
else else
# End FreeBSD # End FreeBSD
# if we have autoloadable modules, just assume the file system
atf_require_prog sysctl
autoload=$(sysctl -n kern.module.autoload) autoload=$(sysctl -n kern.module.autoload)
[ "${autoload}" = "1" ] && return 0 [ "${autoload}" = "1" ] && return 0