Author: kevans
Date: Mon Nov 19 17:09:57 2018
New Revision: 340636
URL: https://svnweb.freebsd.org/changeset/base/340636
Log:
bectl(8) tests: attempt to load the ZFS module
Observed in a CI test image, bectl_create test will run and be marked as
skipped because the module is not loaded. The first zpool invocation will
automagically load the module, but bectl_create is still skipped. Subsequent
tests all pass as expected because the module is now loaded and everything
is OK.
MFC after: 3 days
Modified:
head/sbin/bectl/tests/bectl_test.sh
Modified: head/sbin/bectl/tests/bectl_test.sh
==============================================================================
--- head/sbin/bectl/tests/bectl_test.sh Mon Nov 19 16:47:21 2018
(r340635)
+++ head/sbin/bectl/tests/bectl_test.sh Mon Nov 19 17:09:57 2018
(r340636)
@@ -34,7 +34,7 @@ bectl_create_setup()
disk=$2
mnt=$3
- kldstat -qm zfs || atf_skip "ZFS module not loaded on the current
system"
+ kldload -n -q zfs || atf_skip "ZFS module not loaded on the current
system"
atf_check mkdir -p ${mnt}
atf_check truncate -s 1G ${disk}
atf_check zpool create -o altroot=${mnt} ${zpool} ${disk}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
