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/snapused/snapused_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapused/snapused_003_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 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 usedbydataset is correct.
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 1 lines elided ↑ open up ↑
  41   41  #       2. Make file in the filesystem.
  42   42  #       3. Snapshot it.
  43   43  #       4. Clone it and make file in the cloned filesystem.
  44   44  #       5. Check usedbydataset is correct.
  45   45  #
  46   46  
  47   47  verify_runnable "both"
  48   48  
  49   49  function cleanup
  50   50  {
  51      -        log_must $ZFS destroy -rR $USEDTEST
       51 +        log_must zfs destroy -rR $USEDTEST
  52   52  }
  53   53  
  54   54  log_assert "Verify usedbydataset is correct."
  55   55  log_onexit cleanup
  56   56  
  57      -log_must $ZFS create $USEDTEST
       57 +log_must zfs create $USEDTEST
  58   58  check_usedbydataset $USEDTEST
  59   59  
  60   60  typeset -i i=0
  61   61  typeset -i r_size=0
  62   62  mntpnt=$(get_prop mountpoint $USEDTEST)
  63   63  while ((i < 5)); do
  64   64          ((r_size=(i+1)*16))
  65   65  
  66      -        log_must $MKFILE 16M $mntpnt/file$i
  67      -        log_must $MKFILE "$r_size"M $mntpnt/file_var$i
  68      -        log_must $ZFS snapshot -r $USEDTEST@snap$i
       66 +        log_must mkfile 16M $mntpnt/file$i
       67 +        log_must mkfile "$r_size"M $mntpnt/file_var$i
       68 +        log_must zfs snapshot -r $USEDTEST@snap$i
  69   69  
  70      -        log_must $ZFS clone $USEDTEST@snap$i $USEDTEST/cln$i
  71      -        log_must $ZFS set is:cloned=yes $USEDTEST/cln$i
       70 +        log_must zfs clone $USEDTEST@snap$i $USEDTEST/cln$i
       71 +        log_must zfs set is:cloned=yes $USEDTEST/cln$i
  72   72  
  73   73          mntpnt_cln=$(get_prop mountpoint $USEDTEST/cln$i)
  74      -        log_must $MKFILE 16M $mntpnt_cln/file_cln$i
  75      -        log_must $MKFILE "$r_size"M $mntpnt_cln/file_cln_var$i
       74 +        log_must mkfile 16M $mntpnt_cln/file_cln$i
       75 +        log_must mkfile "$r_size"M $mntpnt_cln/file_cln_var$i
  76   76  
  77   77          check_usedbydataset $USEDTEST
  78   78  
  79   79          ((i = i + 1))
  80   80  done
  81   81  
  82   82  log_pass "Verify usedbydataset is correct."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX