7290 Cdiff usr/src/test/zfs-tests/tests/functional/rsend/rsend_001

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>


*** 24,34 ****
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
  #
--- 24,34 ----
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
  #
*** 48,59 ****
  log_onexit cleanup_pool $POOL2
  
  #
  # Verify the entire pool and sub-ds can be backup and restored.
  #
! log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
! log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
  
  dstds=$(get_dst_ds $POOL $POOL2)
  log_must cmp_ds_subs $POOL $dstds
  log_must cmp_ds_cont $POOL $dstds
  
--- 48,59 ----
  log_onexit cleanup_pool $POOL2
  
  #
  # Verify the entire pool and sub-ds can be backup and restored.
  #
! log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
! log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
  
  dstds=$(get_dst_ds $POOL $POOL2)
  log_must cmp_ds_subs $POOL $dstds
  log_must cmp_ds_cont $POOL $dstds
  
*** 61,72 ****
  log_must cleanup_pool $POOL2
  
  #
  # Verify all the filesystem and sub-fs can be backup and restored.
  #
! log_must eval "$ZFS send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
! log_must eval "$ZFS receive -d $POOL2 < $BACKDIR/fs-final-R"
  
  dstds=$(get_dst_ds $POOL/$FS $POOL2)
  log_must cmp_ds_subs $POOL/$FS $dstds
  log_must cmp_ds_cont $POOL/$FS $dstds
  
--- 61,72 ----
  log_must cleanup_pool $POOL2
  
  #
  # Verify all the filesystem and sub-fs can be backup and restored.
  #
! log_must eval "zfs send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
! log_must eval "zfs receive -d $POOL2 < $BACKDIR/fs-final-R"
  
  dstds=$(get_dst_ds $POOL/$FS $POOL2)
  log_must cmp_ds_subs $POOL/$FS $dstds
  log_must cmp_ds_cont $POOL/$FS $dstds