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/userquota/userquota_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.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 2009 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/userquota/userquota_common.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       the userquota and groupquota can be set during zpool or zfs creation"
  38   38  #
  39   39  #
  40   40  # STRATEGY:
  41   41  #       1. Set userquota and groupquota via "zpool -O or zfs create -o"
  42   42  #
  43   43  
  44   44  verify_runnable "global"
  45   45  
  46   46  function cleanup
  47   47  {
  48   48          if poolexists $TESTPOOL1; then
  49      -                log_must $ZPOOL destroy $TESTPOOL1
       49 +                log_must zpool destroy $TESTPOOL1
  50   50          fi
  51   51  
  52   52          if [[ -f $pool_vdev ]]; then
  53      -                $RM -f $pool_vdev
       53 +                rm -f $pool_vdev
  54   54          fi
  55   55  }
  56   56  
  57   57  log_onexit cleanup
  58   58  
  59   59  log_assert \
  60   60          "the userquota and groupquota can be set during zpool,zfs creation"
  61   61  
  62   62  typeset pool_vdev=/var/tmp/pool_dev.$$
  63   63  
  64      -log_must $MKFILE 500m $pool_vdev
       64 +log_must mkfile 500m $pool_vdev
  65   65  
  66   66  if poolexists $TESTPOOL1; then
  67      -        $ZPOOL destroy $TESTPOOL1
       67 +        zpool destroy $TESTPOOL1
  68   68  fi
  69   69  
  70      -log_must $ZPOOL create -O userquota@$QUSER1=$UQUOTA_SIZE \
       70 +log_must zpool create -O userquota@$QUSER1=$UQUOTA_SIZE \
  71   71          -O groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1 $pool_vdev
  72   72  
  73      -log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
       73 +log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
  74   74          $TESTPOOL1 > /dev/null 2>&1"
  75   75  
  76   76  log_must check_quota "userquota@$QUSER1" $TESTPOOL1 "$UQUOTA_SIZE"
  77   77  log_must check_quota "groupquota@$QGROUP" $TESTPOOL1 "$GQUOTA_SIZE"
  78   78  
  79      -log_must $ZFS create -o userquota@$QUSER1=$UQUOTA_SIZE \
       79 +log_must zfs create -o userquota@$QUSER1=$UQUOTA_SIZE \
  80   80          -o groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1/fs
  81   81  
  82      -log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
       82 +log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
  83   83          $TESTPOOL1 > /dev/null 2>&1"
  84   84  
  85   85  log_must check_quota "userquota@$QUSER1" $TESTPOOL1/fs "$UQUOTA_SIZE"
  86   86  log_must check_quota "groupquota@$QGROUP" $TESTPOOL1/fs "$GQUOTA_SIZE"
  87   87  
  88   88  log_pass \
  89   89          "the userquota and groupquota can be set during zpool,zfs creation"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX