Index: head/etc/mtree/BSD.tests.dist =================================================================== --- head/etc/mtree/BSD.tests.dist (revision 340593) +++ head/etc/mtree/BSD.tests.dist (revision 340594) @@ -1,1056 +1,1058 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . bin cat .. chflags .. chmod .. date .. dd .. echo .. expr .. ln .. ls .. mkdir .. mv .. pax .. pkill .. pwait .. rm .. rmdir .. sh builtins .. errors .. execution .. expansion .. invocation .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin ctfconvert .. ztest .. .. usr.sbin dtrace common aggs .. arithmetic .. arrays .. assocs .. begin .. bitfields .. buffering .. builtinvar .. cg .. clauses .. cpc .. decls .. drops .. dtraceUtil .. end .. env .. enum .. error .. exit .. fbtprovider .. funcs .. grammar .. include .. inline .. io .. ip .. java_api .. json .. lexer .. llquantize .. mdb .. mib .. misc .. multiaggs .. offsetof .. operators .. pid .. plockstat .. pointers .. pragma .. predicates .. preprocessor .. print .. printa .. printf .. privs .. probes .. proc .. profile-n .. providers .. raise .. rates .. safety .. scalars .. sched .. scripting .. sdt .. sizeof .. speculation .. stability .. stack .. stackdepth .. stop .. strlen .. strtoll .. struct .. sugar .. syscall .. sysevent .. tick-n .. trace .. tracemem .. translators .. typedef .. types .. uctf .. union .. usdt .. ustack .. vars .. version .. .. .. zfsd .. .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. csu dynamic .. dynamiclib .. static .. .. libarchive .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. iconv .. inet .. locale .. net getaddrinfo data .. .. .. nss .. regex data .. .. resolv .. rpc .. ssp .. setjmp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. libcam .. libcasper services cap_dns .. cap_grp .. cap_pwd .. cap_sysctl .. .. .. libcrypt .. libdevdctl .. libkvm .. libmp .. libnv .. libproc .. libregex data .. .. librt .. libsbuf .. libthr dlopen .. .. libutil .. libxo .. msun .. .. libexec atf atf-check .. atf-sh .. .. rtld-elf .. tftpd .. .. sbin + bectl + .. dhclient .. devd .. growfs .. ifconfig .. mdconfig .. pfctl files .. .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. tap .. .. .. zoneinfo .. .. sys acl .. aio .. audit .. auditpipe .. capsicum .. cddl zfs bin .. include .. tests acl cifs .. nontrivial .. trivial .. .. atime .. bootfs .. cache .. cachefile .. clean_mirror .. cli_root zfs_upgrade .. zfs_promote .. zfs_clone .. zfs_property .. zfs_destroy .. zpool_create .. zpool_history .. zpool_expand .. zpool_remove .. zfs_mount .. zfs_unshare .. zdb .. zpool_online .. zpool_get .. zpool_export .. zfs_copies .. zfs_get .. zfs .. zpool_clear .. zpool_import blockfiles .. .. zpool .. zpool_offline .. zpool_replace .. zfs_rollback .. zpool_set .. zfs_send .. zfs_set .. zpool_detach .. zfs_diff .. zpool_scrub .. zfs_inherit .. zfs_snapshot .. zfs_share .. zpool_destroy .. zpool_status .. zfs_unmount .. zfs_receive .. zfs_create .. zpool_upgrade blockfiles .. .. zpool_add .. zfs_rename .. zpool_attach .. zfs_reservation .. .. cli_user misc .. zfs_list .. zpool_iostat .. zpool_list .. .. compression .. ctime .. delegate .. devices .. exec .. grow_pool .. grow_replicas .. history .. hotplug .. hotspare .. inheritance .. interop .. inuse .. iscsi .. large_files .. largest_pool .. link_count .. migration .. mmap .. mount .. mv_files .. nestedfs .. no_space .. online_offline .. pool_names .. poolversion .. quota .. redundancy .. refquota .. refreserv .. rename_dirs .. replacement .. reservation .. rootpool .. rsend .. scrub_mirror .. slog .. snapshot .. snapused .. sparse .. threadsappend .. truncate .. txg_integrity .. userquota .. utils_test .. write_dirs .. xattr .. zfsd .. zil .. zinject .. zones .. zvol zvol_ENOSPC .. zvol_cli .. zvol_misc .. zvol_swap .. .. zvol_thrash .. .. .. .. dtrace .. fifo .. file .. fs tmpfs .. .. geom class concat .. eli .. gate .. gpt .. mirror .. nop .. part .. raid3 .. shsec .. stripe .. uzip etalon .. .. .. .. kern acct .. execve .. pipe .. .. kqueue libkqueue .. .. mac bsdextended .. portacl .. .. mqueue .. net .. netinet .. netipsec tunnel .. .. netpfil pf ioctl .. .. .. opencrypto .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. utimensat .. .. posixshm .. sys .. vfs .. vm .. .. usr.bin apply .. awk .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. bsdcat .. calendar .. cmp .. compress .. cpio .. col .. comm .. csplit .. cut .. dc .. diff .. dirname .. du .. file2c .. find .. fold .. getconf .. grep .. gzip .. head .. hexdump .. ident .. indent .. join .. jot .. lastcomm .. limits .. m4 .. mkimg .. ncal .. opensm .. pr .. printf .. procstat .. rs .. sdiff .. sed regress.multitest.out .. .. seq .. soelim .. stat .. tail .. tar .. timeout .. tr .. truncate .. units .. uudecode .. uuencode .. uniq .. vmstat .. xargs .. xinstall .. xo .. yacc yacc .. .. .. usr.sbin chown .. etcupdate .. extattr .. fstyp .. makefs .. newsyslog .. nmtree .. praudit .. pw .. rpcbind .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: head/sbin/bectl/Makefile =================================================================== --- head/sbin/bectl/Makefile (revision 340593) +++ head/sbin/bectl/Makefile (revision 340594) @@ -1,19 +1,24 @@ # $FreeBSD$ +.include + PROG= bectl MAN= bectl.8 SRCS= bectl.c bectl_jail.c bectl_list.c LIBADD+= be LIBADD+= jail LIBADD+= nvpair LIBADD+= util CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -DNEED_SOLARIS_BOOLEAN + +HAS_TESTS= yes +SUBDIR.${MK_TESTS}+= tests .include Index: head/sbin/bectl/tests/Makefile =================================================================== --- head/sbin/bectl/tests/Makefile (nonexistent) +++ head/sbin/bectl/tests/Makefile (revision 340594) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +PACKAGE= tests + +ATF_TESTS_SH+= bectl_test + +.include Property changes on: head/sbin/bectl/tests/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sbin/bectl/tests/bectl_test.sh =================================================================== --- head/sbin/bectl/tests/bectl_test.sh (nonexistent) +++ head/sbin/bectl/tests/bectl_test.sh (revision 340594) @@ -0,0 +1,299 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2018 Kyle Evans +# +# 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 AUTHOR 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 AUTHOR 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. +# +# $FreeBSD$ + +# Establishes a bectl_create zpool that can be used for some light testing; contains +# a 'default' BE and not much else. +bectl_create_setup() +{ + zpool=$1 + disk=$2 + mnt=$3 + + kldstat -qm 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} + atf_check zfs create -o mountpoint=none ${zpool}/ROOT + atf_check zfs create -o mountpoint=/ -o canmount=noauto \ + ${zpool}/ROOT/default +} + +bectl_cleanup() +{ + zpool=$1 + + if zpool get health ${zpool} >/dev/null 2>&1; then + zpool destroy ${zpool} + fi +} + +atf_test_case bectl_create cleanup +bectl_create_head() +{ + + atf_set "descr" "Check the various forms of bectl create" + atf_set "require.user" root +} +bectl_create_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + + bectl_create_setup ${zpool} ${disk} ${mount} + # Test standard creation, creation of a snapshot, and creation from a + # snapshot. + atf_check bectl -r ${zpool}/ROOT create -e default default2 + atf_check bectl -r ${zpool}/ROOT create default2@test_snap + atf_check bectl -r ${zpool}/ROOT create -e default2@test_snap default3 +} +bectl_create_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_destroy cleanup +bectl_destroy_head() +{ + + atf_set "descr" "Check bectl destroy" + atf_set "require.user" root +} +bectl_destroy_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check bectl -r ${zpool}/ROOT create -e default default2 + atf_check -o not-empty zfs get mountpoint ${zpool}/ROOT/default2 + atf_check bectl -r ${zpool}/ROOT destroy default2 + atf_check -e not-empty -s not-exit:0 zfs get mountpoint ${zpool}/ROOT/default2 +} +bectl_destroy_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_export_import cleanup +bectl_export_import_head() +{ + + atf_set "descr" "Check bectl export and import" + atf_set "require.user" root +} +bectl_export_import_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check -o save:exported bectl -r ${zpool}/ROOT export default + atf_check -x "bectl -r ${zpool}/ROOT import default2 < exported" + atf_check -o not-empty zfs get mountpoint ${zpool}/ROOT/default2 + atf_check bectl -r ${zpool}/ROOT destroy default2 + atf_check -e not-empty -s not-exit:0 zfs get mountpoint \ + ${zpool}/ROOT/default2 +} +bectl_export_import_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_list cleanup +bectl_list_head() +{ + + atf_set "descr" "Check bectl list" + atf_set "require.user" root +} +bectl_list_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + + bectl_create_setup ${zpool} ${disk} ${mount} + # Test the list functionality, including that BEs come and go away + # as they're created and destroyed. Creation and destruction tests + # use the 'zfs' utility to verify that they're actually created, so + # these are just light tests that 'list' is picking them up. + atf_check -o save:list.out bectl -r ${zpool}/ROOT list + atf_check -o not-empty grep 'default' list.out + atf_check bectl -r ${zpool}/ROOT create -e default default2 + atf_check -o save:list.out bectl -r ${zpool}/ROOT list + atf_check -o not-empty grep 'default2' list.out + atf_check bectl -r ${zpool}/ROOT destroy default2 + atf_check -o save:list.out bectl -r ${zpool}/ROOT list + atf_check -s not-exit:0 grep 'default2' list.out + # XXX TODO: Formatting checks +} +bectl_list_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_mount cleanup +bectl_mount_head() +{ + + atf_set "descr" "Check bectl mount/unmount" + atf_set "require.user" root +} +bectl_mount_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + root=${mount}/root + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check mkdir -p ${root} + # Test unmount first... + atf_check -o not-empty bectl -r ${zpool}/ROOT mount default ${root} + atf_check -o not-empty -x "mount | grep '^${zpool}/ROOT/default'" + atf_check bectl -r ${zpool}/ROOT unmount default + atf_check -s not-exit:0 -x "mount | grep '^${zpool}/ROOT/default'" + # Then umount! + atf_check -o not-empty bectl -r ${zpool}/ROOT mount default ${root} + atf_check -o not-empty -x "mount | grep '^${zpool}/ROOT/default'" + atf_check bectl -r ${zpool}/ROOT umount default + atf_check -s not-exit:0 -x "mount | grep '^${zpool}/ROOT/default'" +} +bectl_mount_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_rename cleanup +bectl_rename_head() +{ + + atf_set "descr" "Check bectl rename" + atf_set "require.user" root +} +bectl_rename_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check bectl -r ${zpool}/ROOT rename default default2 + atf_check -o not-empty zfs get mountpoint ${zpool}/ROOT/default2 + atf_check -e not-empty -s not-exit:0 zfs get mountpoint \ + ${zpool}/ROOT/default +} +bectl_rename_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_test_case bectl_jail cleanup +bectl_jail_head() +{ + + atf_set "descr" "Check bectl rename" + atf_set "require.user" root +} +bectl_jail_body() +{ + cwd=$(realpath .) + zpool=bectl_test + disk=${cwd}/disk.img + mount=${cwd}/mnt + root=${mount}/root + + if [ ! -f /rescue/rescue ]; then + atf_skip "This test requires a rescue binary" + fi + bectl_create_setup ${zpool} ${disk} ${mount} + # Prepare our minimal BE... plop a rescue binary into it + atf_check mkdir -p ${root} + atf_check -o ignore bectl -r ${zpool}/ROOT mount default ${root} + atf_check mkdir -p ${root}/rescue + atf_check cp /rescue/rescue ${root}/rescue/rescue + atf_check bectl -r ${zpool}/ROOT umount default + + # Basic command-mode tests, with and without jail cleanup + atf_check -o inline:"rescue\n" bectl -r ${zpool}/ROOT \ + jail default /rescue/rescue ls -1 + atf_check -o inline:"rescue\n" bectl -r ${zpool}/ROOT \ + jail -Uo path=${root} default /rescue/rescue ls -1 + atf_check [ -f ${root}/rescue/rescue ] + atf_check bectl -r ${zpool}/ROOT ujail default + + # Batch mode tests + atf_check bectl -r ${zpool}/ROOT jail -bo path=${root} default + atf_check -o not-empty -x "jls | grep -F \"${root}\"" + atf_check bectl -r ${zpool}/ROOT ujail default + atf_check -s not-exit:0 -x "jls | grep -F \"${root}\"" + # 'unjail' naming + atf_check bectl -r ${zpool}/ROOT jail -b default + atf_check bectl -r ${zpool}/ROOT unjail default + atf_check -s not-exit:0 -x "jls | grep -F \"${root}\"" + # cannot unjail an unjailed BE (by either command name) + atf_check -e ignore -s not-exit:0 bectl -r ${zpool}/ROOT ujail default + atf_check -e ignore -s not-exit:0 bectl -r ${zpool}/ROOT unjail default + + # set+unset + atf_check bectl -r ${zpool}/ROOT jail -b -o path=${root} -u path default + # Ensure that it didn't mount at ${root} + atf_check -s not-exit:0 -x "mount | grep -F '${root}'" + atf_check bectl -r ${zpool}/ROOT ujail default +} +bectl_jail_cleanup() +{ + + bectl_cleanup bectl_test +} + +atf_init_test_cases() +{ + atf_add_test_case bectl_create + atf_add_test_case bectl_destroy + atf_add_test_case bectl_export_import + atf_add_test_case bectl_list + atf_add_test_case bectl_mount + atf_add_test_case bectl_rename + atf_add_test_case bectl_jail +} Property changes on: head/sbin/bectl/tests/bectl_test.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property