Index: projects/zfsd/head/etc/mtree/BSD.tests.dist =================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329290) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329291) @@ -1,1034 +1,1032 @@ # $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 .. rmdir .. sh builtins .. errors .. execution .. expansion .. invocation .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin ctfconvert .. .. 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 .. .. 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 .. .. sbin dhclient .. devd .. growfs .. ifconfig .. mdconfig .. pfctl files .. .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. tap .. .. .. zoneinfo .. .. sys acl .. aio .. 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 .. mdb .. migration .. mmap .. mount .. mv_files .. nestedfs .. no_space .. online_offline .. pool_names .. poolversion .. privilege .. 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 .. .. 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 .. .. 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 .. pw .. rpcbind .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/cleanup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/cleanup.ksh (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/cleanup.ksh (nonexistent) @@ -1,36 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)cleanup.ksh 1.2 07/01/09 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -verify_runnable "global" - -$RM -f $OUTFILE > /dev/null 2>&1 - -default_cleanup Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh (nonexistent) @@ -1,55 +0,0 @@ -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2012 Spectra Logic. All rights reserved. -# Use is subject to license terms. -# - - -atf_test_case mdb_001_pos cleanup -mdb_001_pos_head() -{ - atf_set "descr" "Verify that the ZFS mdb dcmds and walkers are working as expected." - atf_set "require.progs" mdb - atf_set "timeout" 1800 -} -mdb_001_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/mdb.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/mdb_001_pos.ksh || atf_fail "Testcase failed" -} -mdb_001_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/mdb.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_init_test_cases() -{ - - atf_add_test_case mdb_001_pos -} Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_001_pos.ksh (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_001_pos.ksh (nonexistent) @@ -1,138 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)mdb_001_pos.ksh 1.4 08/11/03 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -################################################################################# -# -# __stc_assertion_start -# -# ID: mdb_001_pos -# -# DESCRIPTION: -# Verify that the ZFS mdb dcmds and walkers are working as expected. -# -# STRATEGY: -# 1) Given a list of dcmds and walkers -# 2) Step through each element of the list -# 3) Verify the output by checking for "mdb:" in the output string -# -# TESTABILITY: explicit -# -# TEST_AUTOMATION_LEVEL: automated -# -# CODING_STATUS: COMPLETED (2006-10-11) -# -# __stc_assertion_end -# -################################################################################ - -verify_runnable "global" - -set -A dcmds "::walk spa" \ - "::walk spa | ::spa " \ - "::walk spa | ::spa -c" \ - "::walk spa | ::spa -v" \ - "::walk spa | ::spa_config" \ - "::walk spa | ::spa_verify" \ - "::walk spa | ::spa_space" \ - "::walk spa | ::spa_space -b" \ - "::walk spa | ::spa_vdevs" \ - "::walk spa | ::walk metaslab" \ - "::walk spa | ::print struct spa spa_root_vdev | ::vdev" \ - "::walk spa | ::print struct spa spa_root_vdev | ::vdev -re" \ - "::dbufs" \ - "::dbufs -n mos -o mdn -l 0 -b 0" \ - "::dbufs | ::dbuf" \ - "::dbuf_stats" \ - "::abuf_find 1 2" \ - "0x2FFFFF::zio_pipeline" -# -# The commands above were supplied by the ZFS development team. The idea is to -# do as much checking as possible without the need to hardcode addresses. -# -# 0x2FFFFF::zio_pipeline - The dcmd converts the number to an ASCII string so -# we pass the maximum value to the dcmd to ensure all pipeline commands are -# listed. -# - -# -# Append Solaris 5.11 specific dcmds -# -typeset -i i=${#dcmds[*]} -if check_version "5.11" ; then - for str in "::walk spa | ::print -a struct spa spa_uberblock.ub_rootbp | ::blkptr" \ - "::walk spa | ::print -a struct spa spa_dsl_pool->dp_dirty_datasets | ::walk txg_list" \ - "::walk spa | ::walk zms_freelist" - do - dcmds[$i]="$str" - - ((i = i + 1)) - done -else - for str in "::walk spa | ::walk zms_freelist" - do - dcmds[$i]="$str" - - ((i = i + 1)) - done -fi - - -log_assert "Verify that the ZFS mdb dcmds and walkers are working as expected." - -typeset -i RET=0 - -$RM -f $OUTFILE > /dev/null 2>&1 - -i=0 -while (( $i < ${#dcmds[*]} )); do - log_note "Verifying: '${dcmds[i]}'" - $ECHO "${dcmds[i]}" | $MDB -k > $OUTFILE 2>&1 - RET=$? - if (( $RET != 0 )); then - log_fail "mdb '${dcmds[i]}' returned error $RET" - fi - - # - # mdb prefixes all errors with "mdb: " so we check the output. - # - $GREP "mdb:" $OUTFILE > /dev/null 2>&1 - RET=$? - if (( $RET == 0 )); then - $ECHO "mdb '${dcmds[i]}' contained 'mdb:'" - # Using $TAIL limits the number of lines in the log - $TAIL -100 $OUTFILE - log_fail "mdb walker or dcmd failed" - fi - - ((i = i + 1)) -done - -log_pass "The ZFS mdb dcmds and walkers are working as expected." Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/setup.ksh (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/setup.ksh (nonexistent) @@ -1,36 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)setup.ksh 1.2 07/01/09 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -verify_runnable "global" - -DISK=${DISKS%% *} - -default_setup "$DISK" Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile (nonexistent) @@ -1,17 +0,0 @@ -# $FreeBSD$ - -.include - -PACKAGE=tests -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mdb -FILESDIR=${TESTSDIR} - -ATF_TESTS_KSH93+= mdb_test -TEST_METADATA+= required_user="root" - -${PACKAGE}FILES+= mdb.cfg -${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= mdb_001_pos.ksh - -.include Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb.cfg =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb.cfg (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb.cfg (nonexistent) @@ -1,30 +0,0 @@ -# vim: filetype=sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)mdb.cfg 1.3 08/08/15 SMI" -# -export OUTFILE="mdb.out.${TESTCASE_ID}" -export STF_TIMEOUT=1800 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 329291) @@ -1,91 +1,90 @@ # $FreeBSD$ .include PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= atime TESTS_SUBDIRS+= bootfs TESTS_SUBDIRS+= cache TESTS_SUBDIRS+= cachefile TESTS_SUBDIRS+= clean_mirror TESTS_SUBDIRS+= cli_root TESTS_SUBDIRS+= cli_user TESTS_SUBDIRS+= compression TESTS_SUBDIRS+= ctime TESTS_SUBDIRS+= delegate TESTS_SUBDIRS+= devices TESTS_SUBDIRS+= exec TESTS_SUBDIRS+= grow_pool TESTS_SUBDIRS+= grow_replicas TESTS_SUBDIRS+= history TESTS_SUBDIRS+= hotplug TESTS_SUBDIRS+= hotspare TESTS_SUBDIRS+= inheritance # Not yet ported to FreeBSD # TESTS_SUBDIRS+= interop TESTS_SUBDIRS+= inuse # Not yet ported to FreeBSD # TESTS_SUBDIRS+= iscsi TESTS_SUBDIRS+= large_files # Not yet ported to FreeBSD # TESTS_SUBDIRS+= largest_pool # link_count is not yet ported to FreeBSD. I'm not sure what its purpose is. # The assertion message contradicts with the log_fail message. # TESTS_SUBDIRS+= link_count -TESTS_SUBDIRS+= mdb TESTS_SUBDIRS+= migration TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= mount TESTS_SUBDIRS+= mv_files TESTS_SUBDIRS+= nestedfs TESTS_SUBDIRS+= no_space TESTS_SUBDIRS+= online_offline TESTS_SUBDIRS+= pool_names TESTS_SUBDIRS+= poolversion TESTS_SUBDIRS+= privilege TESTS_SUBDIRS+= quota TESTS_SUBDIRS+= redundancy TESTS_SUBDIRS+= refquota TESTS_SUBDIRS+= refreserv # Broken on every OS # TESTS_SUBDIRS+= rename_dirs TESTS_SUBDIRS+= replacement TESTS_SUBDIRS+= reservation TESTS_SUBDIRS+= rootpool # Not yet ported to FreeBSD # TESTS_SUBDIRS+= rsend TESTS_SUBDIRS+= scrub_mirror TESTS_SUBDIRS+= slog TESTS_SUBDIRS+= snapshot TESTS_SUBDIRS+= snapused TESTS_SUBDIRS+= sparse TESTS_SUBDIRS+= threadsappend TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= txg_integrity TESTS_SUBDIRS+= userquota TESTS_SUBDIRS+= utils_test TESTS_SUBDIRS+= write_dirs # Not yet ported to FreeBSD # TESTS_SUBDIRS+= xattr TESTS_SUBDIRS+= zfsd TESTS_SUBDIRS+= zil # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zinject # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zones TESTS_SUBDIRS+= zvol TESTS_SUBDIRS+= zvol_thrash # This is primarily useful for identifying which test a testid corresponds to. # Sometimes all you might have is a pool name like 'testpool.1316'. testids: for i in `find ${.CURDIR} -name '*.sh' | xargs grep '^atf_test_case '|awk '{print $$2}'`; do \ echo "$${i}: $$(echo $$i | cksum -o 2 | cut -d" " -f1)"; \ done .PHONY: testids .include