Date: Thu, 22 Feb 2018 16:59:55 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329828 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/snapshot Message-ID: <201802221659.w1MGxtIK006889@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Thu Feb 22 16:59:55 2018 New Revision: 329828 URL: https://svnweb.freebsd.org/changeset/base/329828 Log: Fix and reenable clone_001_pos tests/sys/cddl/zfs/include/libtest.kshlib Declare local variables tests/sys/cddl/zfs/snapshot/clone_001_pos.ksh * Remove a Solarism * Remove extraneous teardown steps * Don't autofail on FreeBSD tests/sys/cddl/zfs/snapshot/snapshot_test.sh Clear an expected failure, and skip if vfs.zfs.vol.recursive=0 Submitted by: avg Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 22 16:59:55 2018 (r329828) @@ -3427,6 +3427,7 @@ function populate_dir # basename num_files write_count typeset -i num_files=$2 typeset -i write_count=$3 typeset -i blocksz=$4 + typeset -i i typeset data=$5 typeset snapbase="$6" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh Thu Feb 22 16:59:55 2018 (r329828) @@ -71,7 +71,7 @@ set -A args "$SNAPFS" "$SNAPDIR" "$TESTPOOL/$TESTCLONE function setup_all { - create_pool $TESTPOOL1 /dev/zvol/dsk/$TESTPOOL/$TESTVOL + create_pool $TESTPOOL1 /dev/zvol/$TESTPOOL/$TESTVOL log_must $ZFS create $TESTPOOL1/$TESTFS log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL1/$TESTFS @@ -80,25 +80,6 @@ function setup_all function cleanup_all { - typeset -i i=0 - - i=0 - while (( i < ${#args[*]} )); do - snapexists ${args[i]} && \ - log_must $ZFS destroy -Rf ${args[i]} - - [[ -d ${args[i+3]} ]] && \ - log_must $RM -rf ${args[i+3]} - - [[ -d ${args[i+1]} ]] && \ - log_must $RM -rf ${args[i+1]} - - (( i = i + 4 )) - done - - datasetexists $TESTPOOL1/$TESTFS && \ - log_must $ZFS destroy -f $TESTPOOL1/$TESTFS - destroy_pool $TESTPOOL1 [[ -d $TESTDIR2 ]] && \ @@ -110,9 +91,6 @@ function cleanup_all log_assert "Verify a cloned file system is writable." log_onexit cleanup_all - -[[ $os_name == "FreeBSD" ]] && - log_uninitiated "Creating a pool on a zvol is not yet supported in FreeBSD" setup_all Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Thu Feb 22 16:59:55 2018 (r329828) @@ -32,11 +32,11 @@ clone_001_pos_head() } clone_001_pos_body() { - atf_expect_fail "Creating a pool on a zvol is not yet supported in FreeBSD" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg verify_disk_count "$DISKS" 1 + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/clone_001_pos.ksh || atf_fail "Testcase failed" }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802221659.w1MGxtIK006889>