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/grow_pool/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.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 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/grow_pool/grow_pool.cfg
  34   34  
  35   35  verify_runnable "global"
  36   36  
  37   37  ismounted $TESTFS && \
  38      -        log_must $ZFS umount $TESTDIR
       38 +        log_must zfs umount $TESTDIR
  39   39  destroy_pool "$TESTPOOL"
  40   40  
  41   41  #
  42   42  # Here we create & destroy a zpool using the disks
  43   43  # because this resets the partitions to normal
  44   44  #
  45   45  if [[ -z $DISK ]]; then
  46   46          create_pool ZZZ "$DISK0 $DISK1"
  47   47          destroy_pool ZZZ
  48   48  else
  49   49          create_pool ZZZ "$DISK"
  50   50          destroy_pool ZZZ
  51   51  fi
  52   52  
  53   53  log_pass
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX