Print this page
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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib
↓ open down ↓ 33 lines elided ↑ open up ↑
  34   34  # Function to set the reservation property of a dataset to
  35   35  # 'none' and verify that it is correctly set using both the
  36   36  # "normal" 'zfs get reservation' and the '-p' option which
  37   37  # gives a numerical value.
  38   38  #
  39   39  function zero_reservation
  40   40  {
  41   41          typeset resv_val
  42   42          dataset=$1
  43   43  
  44      -        log_must $ZFS set reservation=none $dataset
       44 +        log_must zfs set reservation=none $dataset
  45   45  
  46      -        resv_val=`$ZFS get -H reservation $dataset | awk '{print $3}'`
       46 +        resv_val=`zfs get -H reservation $dataset | awk '{print $3}'`
  47   47          if [[ $? -ne 0 ]]; then
  48   48                  log_fail "Unable to get reservation prop on $dataset"
  49   49          elif [[ $resv_val != "none" ]]; then
  50   50                  log_fail "Reservation not 'none' ($resv_val) as expected"
  51   51          fi
  52   52  
  53   53  
  54      -        resv_val=`$ZFS get -pH reservation $dataset | awk '{print $3}'`
       54 +        resv_val=`zfs get -pH reservation $dataset | awk '{print $3}'`
  55   55          if [[ $? -ne 0 ]]; then
  56   56                  log_fail "Unable to get reservation prop on $dataset"
  57   57          elif [[ $resv_val -ne 0 ]]; then
  58   58                  log_fail "Reservation not 0 ($resv_val) as expected"
  59   59          fi
  60   60  
  61   61          return 0
  62   62  }
  63   63  
  64   64  #
↓ open down ↓ 28 lines elided ↑ open up ↑
  93   93  # taken from the loop counter.
  94   94  #
  95   95  function create_multiple_fs # num_fs base_fs_name base_mnt_name
  96   96  {
  97   97          typeset -i iter=0
  98   98          typeset -i count=$1
  99   99          typeset FS_NAME=$2
 100  100          typeset MNT_NAME=$3
 101  101  
 102  102          while  (($iter < $count)); do
 103      -                log_must $ZFS create ${FS_NAME}$iter
 104      -                log_must $ZFS set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter
      103 +                log_must zfs create ${FS_NAME}$iter
      104 +                log_must zfs set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter
 105  105                  ((iter = iter + 1))
 106  106          done
 107  107  }
 108  108  
 109  109  #
 110  110  # This function compute the largest volume size which is multiple of volume
 111  111  # block size (default 8K) and not greater than the largest expected volsize.
 112  112  #
 113  113  # $1 The largest expected volume size.
 114  114  # $2 The volume block size
↓ open down ↓ 87 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX