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>

          --- old/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh

   1    1  #! /usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]

  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29      -# Copyright (c) 2013 by Delphix. All rights reserved.
       29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/include/libtest.shlib
  33   33  . $STF_SUITE/tests/functional/scrub_mirror/default.cfg
  34   34  
  35   35  
  36   36  verify_runnable "global"
  37   37  
  38      -$DF -F zfs -h | $GREP "$TESTFS " >/dev/null
  39      -[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
       38 +df -F zfs -h | grep "$TESTFS " >/dev/null
       39 +[[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
  40   40  destroy_pool $TESTPOOL
  41   41  
  42   42  # recreate and destroy a zpool over the disks to restore the partitions to
  43   43  # normal
  44   44  if [[ -n $SINGLE_DISK ]]; then
  45   45          log_must cleanup_devices $MIRROR_PRIMARY
  46   46  else
  47   47          log_must cleanup_devices $MIRROR_PRIMARY $MIRROR_SECONDARY
  48   48  fi
  49   49  
  50   50  log_pass
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX