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>

          --- old/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh

   1    1  #!/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]

  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 can handle stream with multiple identical (same GUID) snapshots
  37   37  #
  38   38  # STRATEGY:
  39   39  #       1. Recursively backup snapshot
  40   40  #       2. Restore it to the given filesystem
  41   41  #       3. Resend the snapshot again
  42   42  #       4. Verify this stream can be restore to this filesystem again
  43   43  #
  44   44  
  45   45  verify_runnable "both"
  46   46  
  47   47  log_assert "ZFS can handle stream with multiple identical (same GUID) snapshots"
  48   48  log_onexit cleanup_pool $POOL2
  49   49  
  50      -log_must $ZFS create $POOL2/$FS
  51      -log_must $ZFS snapshot $POOL2/$FS@snap
       50 +log_must zfs create $POOL2/$FS
       51 +log_must zfs snapshot $POOL2/$FS@snap
  52   52  
  53   53  #
  54   54  # First round restore the stream
  55   55  #
  56      -log_must eval "$ZFS send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
  57      -log_must eval "$ZFS receive -d -F $POOL2/$FS < $BACKDIR/fs-R"
       56 +log_must eval "zfs send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
       57 +log_must eval "zfs receive -d -F $POOL2/$FS < $BACKDIR/fs-R"
  58   58  
  59   59  #
  60   60  # In order to avoid 'zfs send -R' failed, create snapshot for
  61   61  # all the sub-systems
  62   62  #
  63      -list=$($ZFS list -r -H -o name -t filesystem $POOL2/$FS)
       63 +list=$(zfs list -r -H -o name -t filesystem $POOL2/$FS)
  64   64  for item in $list ; do
  65   65          if datasetnonexists $item@snap ; then
  66      -                log_must $ZFS snapshot $item@snap
       66 +                log_must zfs snapshot $item@snap
  67   67          fi
  68   68  done
  69   69  
  70   70  #
  71   71  # Second round restore the stream
  72   72  #
  73      -log_must eval "$ZFS send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
       73 +log_must eval "zfs send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
  74   74  dstds=$(get_dst_ds $POOL2/$FS $POOL2/$FS)
  75      -log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/fs-R"
       75 +log_must eval "zfs receive -d -F $dstds < $BACKDIR/fs-R"
  76   76  
  77   77  log_pass "ZFS can handle stream with multiple identical (same GUID) snapshots"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX