7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 24,34 ****
  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/slog/slog.kshlib
  
  #
--- 24,34 ----
  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/slog/slog.kshlib
  
  #
*** 46,92 ****
  
  function cleanup_testenv
  {
          cleanup
          if datasetexists $TESTPOOL2 ; then
!                 log_must $ZPOOL destroy -f $TESTPOOL2
          fi
          if [[ -n $lofidev ]]; then
!                 $LOFIADM -d $lofidev
          fi
  }
  
  log_assert "Verify slog device can be disk, file, lofi device or any device " \
          "that presents a block interface."
  verify_disk_count "$DISKS" 2
  log_onexit cleanup_testenv
  
  dsk1=${DISKS%% *}
! log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
  
  # Add nomal disk
! log_must $ZPOOL add $TESTPOOL log $dsk1
  log_must verify_slog_device $TESTPOOL $dsk1 'ONLINE'
  # Add nomal file
! log_must $ZPOOL add $TESTPOOL log $LDEV
  ldev=$(random_get $LDEV)
  log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
  
  # Add lofi device
  lofidev=${LDEV2%% *}
! log_must $LOFIADM -a $lofidev
! lofidev=$($LOFIADM $lofidev)
! log_must $ZPOOL add $TESTPOOL log $lofidev
  log_must verify_slog_device $TESTPOOL $lofidev 'ONLINE'
  
  log_pass "Verify slog device can be disk, file, lofi device or any device " \
          "that presents a block interface."
  
  # Add file which reside in the itself
  mntpnt=$(get_prop mountpoint $TESTPOOL)
! log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev
! log_must $ZPOOL add $TESTPOOL $mntpnt/vdev
  
  # Add ZFS volume
  vol=$TESTPOOL/vol
! log_must $ZPOOL create -V $MINVDEVSIZE $vol
! log_must $ZPOOL add $TESTPOOL /dev/zvol/dsk/$vol
--- 46,92 ----
  
  function cleanup_testenv
  {
          cleanup
          if datasetexists $TESTPOOL2 ; then
!                 log_must zpool destroy -f $TESTPOOL2
          fi
          if [[ -n $lofidev ]]; then
!                 lofiadm -d $lofidev
          fi
  }
  
  log_assert "Verify slog device can be disk, file, lofi device or any device " \
          "that presents a block interface."
  verify_disk_count "$DISKS" 2
  log_onexit cleanup_testenv
  
  dsk1=${DISKS%% *}
! log_must zpool create $TESTPOOL ${DISKS#$dsk1}
  
  # Add nomal disk
! log_must zpool add $TESTPOOL log $dsk1
  log_must verify_slog_device $TESTPOOL $dsk1 'ONLINE'
  # Add nomal file
! log_must zpool add $TESTPOOL log $LDEV
  ldev=$(random_get $LDEV)
  log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
  
  # Add lofi device
  lofidev=${LDEV2%% *}
! log_must lofiadm -a $lofidev
! lofidev=$(lofiadm $lofidev)
! log_must zpool add $TESTPOOL log $lofidev
  log_must verify_slog_device $TESTPOOL $lofidev 'ONLINE'
  
  log_pass "Verify slog device can be disk, file, lofi device or any device " \
          "that presents a block interface."
  
  # Add file which reside in the itself
  mntpnt=$(get_prop mountpoint $TESTPOOL)
! log_must mkfile $MINVDEVSIZE $mntpnt/vdev
! log_must zpool add $TESTPOOL $mntpnt/vdev
  
  # Add ZFS volume
  vol=$TESTPOOL/vol
! log_must zpool create -V $MINVDEVSIZE $vol
! log_must zpool add $TESTPOOL /dev/zvol/dsk/$vol