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_013_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/rsend/rsend_013_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/tests/functional/rsend/rsend.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       zfs receive -dF with incremental stream will destroy all the
  37   37  #       dataset that not exist on the sender side.
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 16 lines elided ↑ open up ↑
  56   56  
  57   57  log_assert "zfs receive -dF will destroy all the dataset that not exist" \
  58   58          "on the sender side"
  59   59  log_onexit cleanup
  60   60  
  61   61  cleanup
  62   62  
  63   63  #
  64   64  # Duplicate POOL2 for testing
  65   65  #
  66      -log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
  67      -log_must eval "$ZFS receive -dF $POOL2 < $BACKDIR/pool-final-R"
       66 +log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
       67 +log_must eval "zfs receive -dF $POOL2 < $BACKDIR/pool-final-R"
  68   68  
  69      -log_must $ZFS destroy -Rf $POOL/$FS
  70      -log_must $ZFS destroy -Rf $POOL/pclone
       69 +log_must zfs destroy -Rf $POOL/$FS
       70 +log_must zfs destroy -Rf $POOL/pclone
  71   71  
  72   72  if is_global_zone ; then
  73      -        log_must $ZFS destroy -Rf $POOL/vol
       73 +        log_must zfs destroy -Rf $POOL/vol
  74   74  fi
  75      -log_must $ZFS snapshot -r $POOL@destroy
       75 +log_must zfs snapshot -r $POOL@destroy
  76   76  
  77      -log_must eval "$ZFS send -R -I @final $POOL@destroy > " \
       77 +log_must eval "zfs send -R -I @final $POOL@destroy > " \
  78   78          "$BACKDIR/pool-final-destroy-IR"
  79      -log_must eval "$ZFS receive -dF $POOL2 < $BACKDIR/pool-final-destroy-IR"
       79 +log_must eval "zfs receive -dF $POOL2 < $BACKDIR/pool-final-destroy-IR"
  80   80  
  81   81  dstds=$(get_dst_ds $POOL $POOL2)
  82   82  log_must cmp_ds_subs $POOL $dstds
  83   83  log_must cmp_ds_cont $POOL $dstds
  84   84  
  85   85  log_pass "zfs receive -dF will destroy all the dataset that not exist" \
  86   86          "on the sender side"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX