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/snapused/snapused_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapused/snapused_002_pos.ksh

   1    1  #!/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/snapused/snapused.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Verify usedbychildren is correct.
  38   38  #
  39   39  # STRATEGY:

  40   40  #       1. Create a filesystem.
  41   41  #       2. Create sub filesystem and make file in it.

  42   42  #       3. Set reservation of the sub filesystem.
  43   43  #       4. Create volume under it.
  44   44  #       5. Snapshot it.
  45   45  #       6. Check usedbychildren is correct.
  46   46  #
  47   47  
  48   48  verify_runnable "both"
  49   49  
  50   50  function cleanup
  51   51  {
  52      -        log_must $ZFS destroy -rR $USEDTEST
       52 +        log_must zfs destroy -rR $USEDTEST
  53   53  }
  54   54  
  55   55  log_assert "Verify usedbychildren is correct."
  56   56  log_onexit cleanup
  57   57  
  58      -log_must $ZFS create $USEDTEST
       58 +log_must zfs create $USEDTEST
  59   59  check_usedbychildren $USEDTEST
  60   60  
  61   61  typeset -i i=0
  62   62  typeset -i r_size=0
  63   63  mntpnt=$(get_prop mountpoint $USEDTEST)
  64   64  while ((i < 5)); do
  65   65          ((r_size=(i+1)*16))
  66   66  
  67      -        log_must $ZFS create $USEDTEST/fs$i
  68      -        log_must $ZFS set reservation="$r_size"M $USEDTEST/fs$i
  69      -        log_must $MKFILE 48M $mntpnt/fs$i/file$i
       67 +        log_must zfs create $USEDTEST/fs$i
       68 +        log_must zfs set reservation="$r_size"M $USEDTEST/fs$i
       69 +        log_must mkfile 48M $mntpnt/fs$i/file$i
  70   70  
  71   71          if is_global_zone; then
  72      -                log_must $ZFS create -V 32M $USEDTEST/vol$i
       72 +                log_must zfs create -V 32M $USEDTEST/vol$i
  73   73          fi
  74   74  
  75      -        log_must $ZFS snapshot -r $USEDTEST@snap$i
       75 +        log_must zfs snapshot -r $USEDTEST@snap$i
  76   76  
  77   77          check_usedbychildren $USEDTEST
  78   78  
  79   79          ((i = i + 1))
  80   80  done
  81   81  
  82   82  log_pass "Verify usedbychildren is correct."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX