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 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/cache/cache.cfg
  . $STF_SUITE/tests/functional/cache/cache.kshlib
  
--- 24,34 ----
  # Copyright 2008 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/cache/cache.cfg
  . $STF_SUITE/tests/functional/cache/cache.kshlib
  
*** 48,65 ****
  log_assert "Adding a cache device to normal pool works."
  log_onexit cleanup
  
  for type in "" "mirror" "raidz" "raidz2"
  do
!         log_must $ZPOOL create $TESTPOOL $type $VDEV
!         log_must $ZPOOL add $TESTPOOL cache $LDEV
          log_must display_status $TESTPOOL
          typeset ldev=$(random_get $LDEV)
          log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
  
!         log_must $ZPOOL remove $TESTPOOL $ldev
          log_must check_vdev_state $TESTPOOL $ldev ""
  
!         log_must $ZPOOL destroy -f $TESTPOOL
  done
  
  log_pass "Adding a cache device to normal pool works."
--- 48,65 ----
  log_assert "Adding a cache device to normal pool works."
  log_onexit cleanup
  
  for type in "" "mirror" "raidz" "raidz2"
  do
!         log_must zpool create $TESTPOOL $type $VDEV
!         log_must zpool add $TESTPOOL cache $LDEV
          log_must display_status $TESTPOOL
          typeset ldev=$(random_get $LDEV)
          log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
  
!         log_must zpool remove $TESTPOOL $ldev
          log_must check_vdev_state $TESTPOOL $ldev ""
  
!         log_must zpool destroy -f $TESTPOOL
  done
  
  log_pass "Adding a cache device to normal pool works."