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_022_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
↓ open down ↓ 4 lines elided ↑ open up ↑
   5    5  # Common Development and Distribution License ("CDDL"), version 1.0.
   6    6  # You may only use this file in accordance with the terms of version
   7    7  # 1.0 of the CDDL.
   8    8  #
   9    9  # A full copy of the text of the CDDL should have accompanied this
  10   10  # source.  A copy of the CDDL is also available via the Internet at
  11   11  # http://www.illumos.org/license/CDDL.
  12   12  #
  13   13  
  14   14  #
  15      -# Copyright (c) 2014 by Delphix. All rights reserved.
       15 +# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
  16   16  #
  17   17  
  18   18  . $STF_SUITE/include/libtest.shlib
  19   19  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  20   20  
  21   21  #
  22   22  # Description:
  23   23  # Verify resumability of an incremental ZFS send/receive with ZFS bookmarks in
  24   24  # the presence of a corrupted stream.
  25   25  #
↓ open down ↓ 14 lines elided ↑ open up ↑
  40   40  
  41   41  log_assert "Verify resumability of an incremental ZFS send/receive with ZFS " \
  42   42      "bookmarks"
  43   43  log_onexit cleanup_pool $POOL2
  44   44  
  45   45  sendfs=$POOL/sendfs
  46   46  recvfs=$POOL2/recvfs
  47   47  streamfs=$POOL/stream
  48   48  
  49   49  test_fs_setup $POOL $POOL2
  50      -log_must $ZFS bookmark $sendfs@a $sendfs#bm_a
  51      -log_must $ZFS destroy $sendfs@a
  52      -log_must $ZFS receive -v $recvfs </$POOL/initial.zsend
  53      -resume_test "$ZFS send -i \#bm_a $sendfs@b" $streamfs $recvfs
  54      -log_must $ZFS destroy -r -f $sendfs
  55      -log_must $ZFS receive -v $sendfs </$POOL/initial.zsend
  56      -log_must $ZFS receive -v $sendfs </$POOL/incremental.zsend
       50 +log_must zfs bookmark $sendfs@a $sendfs#bm_a
       51 +log_must zfs destroy $sendfs@a
       52 +log_must zfs receive -v $recvfs </$POOL/initial.zsend
       53 +resume_test "zfs send -i \#bm_a $sendfs@b" $streamfs $recvfs
       54 +log_must zfs destroy -r -f $sendfs
       55 +log_must zfs receive -v $sendfs </$POOL/initial.zsend
       56 +log_must zfs receive -v $sendfs </$POOL/incremental.zsend
  57   57  file_check $sendfs $recvfs
  58   58  
  59   59  log_pass "Verify resumability of an incremental ZFS send/receive with ZFS " \
  60   60      "bookmarks"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX