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/rsend/rsend_007_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/rsend/rsend_007_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 2008 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/tests/functional/rsend/rsend.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       Rename parent filesystem name will not change the dependent order.
  37   37  #
  38   38  # STRATEGY:
  39   39  #       1. Separately rename pool clone, filesystem and volume name.
↓ open down ↓ 17 lines elided ↑ open up ↑
  57   57          log_must cleanup_pool $POOL2
  58   58  
  59   59          log_must setup_test_model $POOL
  60   60  }
  61   61  
  62   62  log_assert "Rename parent filesystem name will not change the dependent order."
  63   63  log_onexit cleanup
  64   64  
  65   65  typeset -i i=0
  66   66  while ((i < ${#dtst[@]})); do
  67      -        log_must $ZFS rename ${dtst[$i]} ${dtst[((i+1))]}
       67 +        log_must zfs rename ${dtst[$i]} ${dtst[((i+1))]}
  68   68  
  69   69          ((i += 2))
  70   70  done
  71   71  
  72   72  #
  73   73  # Verify zfs send -R should succeed
  74   74  #
  75      -log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
  76      -log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
       75 +log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
       76 +log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
  77   77  dstds=$(get_dst_ds $POOL $POOL2)
  78   78  log_must cmp_ds_subs $POOL $dstds
  79   79  log_must cmp_ds_cont $POOL $dstds
  80   80  
  81   81  #
  82   82  # Verify zfs send -R -I should succeed
  83   83  #
  84      -log_must eval "$ZFS send -R -I @init $dstds@final > " \
       84 +log_must eval "zfs send -R -I @init $dstds@final > " \
  85   85          "$BACKDIR/pool-init-final-IR"
  86   86  list=$(getds_with_suffix $dstds @snapA)
  87   87  list="$list $(getds_with_suffix $dstds @snapB)"
  88   88  list="$list $(getds_with_suffix $dstds @snapC)"
  89   89  list="$list $(getds_with_suffix $dstds @final)"
  90   90  log_must destroy_tree $list
  91   91  if is_global_zone ; then
  92      -        log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/pool-init-final-IR"
       92 +        log_must eval "zfs receive -d -F $dstds < $BACKDIR/pool-init-final-IR"
  93   93  else
  94      -        $ZFS receive -d -F $dstds < $BACKDIR/pool-init-final-IR
       94 +        zfs receive -d -F $dstds < $BACKDIR/pool-init-final-IR
  95   95  fi
  96   96  log_must cmp_ds_subs $POOL $dstds
  97   97  log_must cmp_ds_cont $POOL $dstds
  98   98  
  99   99  log_pass "Rename parent filesystem name will not change the dependent order."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX