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_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/rsend/rsend_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 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  #       zfs send -I dataset@init to clone@snap can create a clone
  37   37  #
  38   38  # STRATEGY:
  39   39  #       1. Setup test model
↓ open down ↓ 3 lines elided ↑ open up ↑
  43   43  #
  44   44  
  45   45  verify_runnable "both"
  46   46  
  47   47  log_assert "zfs send -I send all incrementals from dataset@init to clone@snap"
  48   48  log_onexit cleanup_pool $POOL2
  49   49  
  50   50  #
  51   51  # Duplicate POOL2
  52   52  #
  53      -log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-R"
  54      -log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-R"
       53 +log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-R"
       54 +log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-R"
  55   55  
  56   56  if is_global_zone ; then
  57   57          #
  58   58          # Verify send -I backup all incrementals from pool
  59   59          #
  60      -        log_must eval "$ZFS send -I $POOL2@psnap $POOL2/pclone@final > " \
       60 +        log_must eval "zfs send -I $POOL2@psnap $POOL2/pclone@final > " \
  61   61                  "$BACKDIR/pool-clone-I"
  62      -        log_must $ZFS destroy -rf $POOL2/pclone
  63      -        log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-clone-I"
       62 +        log_must zfs destroy -rf $POOL2/pclone
       63 +        log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-clone-I"
  64   64          log_must cmp_ds_subs $POOL $POOL2
  65   65          log_must cmp_ds_cont $POOL $POOL2
  66   66  fi
  67   67  
  68   68  dstds=$(get_dst_ds $POOL $POOL2)
  69   69  
  70   70  #
  71   71  # Verify send -I backup all incrementals from filesystem
  72   72  #
  73   73  ds=$dstds/$FS/fs1
  74      -log_must eval "$ZFS send -I $ds/fs2@fsnap $ds/fclone@final > " \
       74 +log_must eval "zfs send -I $ds/fs2@fsnap $ds/fclone@final > " \
  75   75          "$BACKDIR/fs-clone-I"
  76      -log_must $ZFS destroy -rf $ds/fclone
  77      -log_must eval "$ZFS receive -F $ds/fclone < $BACKDIR/fs-clone-I"
       76 +log_must zfs destroy -rf $ds/fclone
       77 +log_must eval "zfs receive -F $ds/fclone < $BACKDIR/fs-clone-I"
  78   78  
  79   79  log_must cmp_ds_subs $POOL $dstds
  80   80  log_must cmp_ds_cont $POOL $dstds
  81   81  
  82   82  if is_global_zone ; then
  83   83          #
  84   84          # Verify send -I backup all incrementals from volume
  85   85          #
  86   86          ds=$POOL2/$FS
  87      -        log_must eval "$ZFS send -I $ds/vol@vsnap $ds/vclone@final > " \
       87 +        log_must eval "zfs send -I $ds/vol@vsnap $ds/vclone@final > " \
  88   88                  "$BACKDIR/vol-clone-I"
  89      -        log_must $ZFS destroy -rf $ds/vclone
  90      -        log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/vol-clone-I"
       89 +        log_must zfs destroy -rf $ds/vclone
       90 +        log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/vol-clone-I"
  91   91          log_must cmp_ds_subs $POOL $POOL2
  92   92          log_must cmp_ds_cont $POOL $POOL2
  93   93  fi
  94   94  
  95   95  log_pass "zfs send -I send all incrementals from dataset@init to clone@snap"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX