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>

*** 22,32 ****
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/xattr/xattr_common.kshlib
  
--- 22,32 ----
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/xattr/xattr_common.kshlib
  
*** 46,63 ****
  
  function cleanup {
  
          if [ -f $TESTDIR/myfile.$$ ]
          then
!                 log_must $RM $TESTDIR/myfile.$$
          fi
  }
  
  log_assert "Create/read/write/append of xattrs works"
  log_onexit cleanup
  
! log_must $TOUCH $TESTDIR/myfile.$$
  create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
  verify_write_xattr $TESTDIR/myfile.$$ passwd
  delete_xattr $TESTDIR/myfile.$$ passwd
  
  log_pass "Create/read/write of xattrs works"
--- 46,63 ----
  
  function cleanup {
  
          if [ -f $TESTDIR/myfile.$$ ]
          then
!                 log_must rm $TESTDIR/myfile.$$
          fi
  }
  
  log_assert "Create/read/write/append of xattrs works"
  log_onexit cleanup
  
! log_must touch $TESTDIR/myfile.$$
  create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
  verify_write_xattr $TESTDIR/myfile.$$ passwd
  delete_xattr $TESTDIR/myfile.$$ passwd
  
  log_pass "Create/read/write of xattrs works"