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/cachefile/cachefile_004_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  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, 2015 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/cachefile/cachefile.cfg
  34   34  . $STF_SUITE/tests/functional/cachefile/cachefile.kshlib
  35   35  
  36   36  #
  37   37  # DESCRIPTION:
  38   38  #       Verify set, export and destroy when cachefile is set on pool.
  39   39  #
↓ open down ↓ 12 lines elided ↑ open up ↑
  52   52  
  53   53  function cleanup
  54   54  {
  55   55          poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
  56   56          poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2
  57   57  
  58   58          mntpnt=$(get_prop mountpoint $TESTPOOL)
  59   59          typeset -i i=0
  60   60          while ((i < 2)); do
  61   61                  if [[ -e $mntpnt/vdev$i ]]; then
  62      -                        log_must $RM -f $mntpnt/vdev$i
       62 +                        log_must rm -f $mntpnt/vdev$i
  63   63                  fi
  64   64                  ((i += 1))
  65   65          done
  66   66  
  67   67          if poolexists $TESTPOOL ; then
  68   68                  destroy_pool $TESTPOOL
  69   69          fi
  70   70  
  71   71          for file in $CPATH1 $CPATH2 ; do
  72   72                  if [[ -f $file ]] ; then
  73      -                        log_must $RM $file
       73 +                        log_must rm $file
  74   74                  fi
  75   75          done
  76   76  }
  77   77  
  78   78  
  79   79  log_assert "Verify set, export and destroy when cachefile is set on pool."
  80   80  log_onexit cleanup
  81   81  
  82      -log_must $ZPOOL create $TESTPOOL $DISKS
       82 +log_must zpool create $TESTPOOL $DISKS
  83   83  
  84   84  mntpnt=$(get_prop mountpoint $TESTPOOL)
  85   85  typeset -i i=0
  86   86  while ((i < 2)); do
  87      -        log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev$i
       87 +        log_must mkfile $MINVDEVSIZE $mntpnt/vdev$i
  88   88          eval vdev$i=$mntpnt/vdev$i
  89   89          ((i += 1))
  90   90  done
  91   91  
  92      -log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0
       92 +log_must zpool create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0
  93   93  log_must pool_in_cache $TESTPOOL1 $CPATH1
  94      -log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1
       94 +log_must zpool create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1
  95   95  log_must pool_in_cache $TESTPOOL2 $CPATH1
  96   96  
  97      -log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1
       97 +log_must zpool set cachefile=$CPATH2 $TESTPOOL1
  98   98  log_must pool_in_cache $TESTPOOL1 $CPATH2
  99      -log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2
       99 +log_must zpool set cachefile=$CPATH2 $TESTPOOL2
 100  100  log_must pool_in_cache $TESTPOOL2 $CPATH2
 101  101  if [[ -f $CPATH1 ]]; then
 102  102          log_fail "Verify set when cachefile is set on pool."
 103  103  fi
 104  104  
 105      -log_must $ZPOOL export $TESTPOOL1
 106      -log_must $ZPOOL export $TESTPOOL2
      105 +log_must zpool export $TESTPOOL1
      106 +log_must zpool export $TESTPOOL2
 107  107  if [[ -f $CPATH2 ]]; then
 108  108          log_fail "Verify export when cachefile is set on pool."
 109  109  fi
 110  110  
 111      -log_must $ZPOOL import -d $mntpnt $TESTPOOL1
 112      -log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1
      111 +log_must zpool import -d $mntpnt $TESTPOOL1
      112 +log_must zpool set cachefile=$CPATH2 $TESTPOOL1
 113  113  log_must pool_in_cache $TESTPOOL1 $CPATH2
 114      -log_must $ZPOOL import -d $mntpnt $TESTPOOL2
 115      -log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2
      114 +log_must zpool import -d $mntpnt $TESTPOOL2
      115 +log_must zpool set cachefile=$CPATH2 $TESTPOOL2
 116  116  log_must pool_in_cache $TESTPOOL2 $CPATH2
 117  117  
 118      -log_must $ZPOOL destroy $TESTPOOL1
 119      -log_must $ZPOOL destroy $TESTPOOL2
      118 +log_must zpool destroy $TESTPOOL1
      119 +log_must zpool destroy $TESTPOOL2
 120  120  if [[ -f $CPATH2 ]]; then
 121  121          log_fail "Verify destroy when cachefile is set on pool."
 122  122  fi
 123  123  
 124  124  log_pass "Verify set, export and destroy when cachefile is set on pool."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX