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/xattr/xattr_006_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/xattr/xattr_006_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  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  #
  27      -# Copyright (c) 2013 by Delphix. All rights reserved.
       27 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  28   28  #
  29   29  
  30   30  . $STF_SUITE/include/libtest.shlib
  31   31  . $STF_SUITE/tests/functional/xattr/xattr_common.kshlib
  32   32  
  33   33  #
  34   34  # DESCRIPTION:
  35   35  # Xattrs present on a file in a snapshot should be visible.
  36   36  #
  37   37  # STRATEGY:
  38   38  #       1. Create a file and give it an xattr
  39   39  #       2. Take a snapshot of the filesystem
  40   40  #       3. Verify that we can take a snapshot of it.
  41   41  #
  42   42  
  43   43  function cleanup {
  44   44  
  45      -        log_must $ZFS destroy $TESTPOOL/$TESTFS@snap
  46      -        log_must $RM $TESTDIR/myfile.$$
       45 +        log_must zfs destroy $TESTPOOL/$TESTFS@snap
       46 +        log_must rm $TESTDIR/myfile.$$
  47   47  
  48   48  }
  49   49  
  50   50  log_assert "read xattr on a snapshot"
  51   51  log_onexit cleanup
  52   52  
  53   53  # create a file, and an xattr on it
  54      -log_must $TOUCH $TESTDIR/myfile.$$
       54 +log_must touch $TESTDIR/myfile.$$
  55   55  create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
  56   56  
  57   57  # snapshot the filesystem
  58      -log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
       58 +log_must zfs snapshot $TESTPOOL/$TESTFS@snap
  59   59  
  60   60  # check for the xattr on the snapshot
  61   61  verify_xattr $TESTDIR/.zfs/snapshot/snap/myfile.$$ passwd /etc/passwd
  62   62  
  63   63  log_pass "read xattr on a snapshot"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX