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/sparse/sparse_001_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh

   1    1  #!/usr/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 2009 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/include/libtest.shlib
  33   33  . $STF_SUITE/tests/functional/sparse/sparse.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # Holes in ZFS files work correctly.
  38   38  #
  39   39  # STRATEGY:
  40   40  # 1. Open file
  41   41  # 2. Write random blocks in random places
  42   42  # 3. Read each block back to check for correctness.
  43   43  # 4. Repeat steps 2 and 3 lots of times
  44   44  #
  45   45  
  46   46  verify_runnable "global"
  47   47  
  48   48  function cleanup
  49   49  {
  50      -        [[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
       50 +        [[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
  51   51  }
  52   52  
  53   53  log_assert "Ensure random blocks are read back correctly"
  54   54  
  55   55  options=""
  56   56  options_display="default options"
  57   57  
  58   58  log_onexit cleanup
  59   59  
  60   60  [[ -n "$HOLES_FILESIZE" ]] && options=" $options -f $HOLES_FILESIZE "

  61   61  
  62   62  [[ -n "$HOLES_BLKSIZE" ]] && options="$options -b $HOLES_BLKSIZE "
  63   63  

  64   64  [[ -n "$HOLES_COUNT" ]] && options="$options -c $HOLES_COUNT "
  65   65  
  66   66  [[ -n "$HOLES_SEED" ]] && options="$options -s $HOLES_SEED "
  67   67  
  68   68  [[ -n "$HOLES_FILEOFFSET" ]] && options="$options -o $HOLES_FILEOFFSET "
  69   69  
  70   70  options="$options -r "
  71   71  
  72   72  [[ -n "$options" ]] && options_display=$options
  73   73  
  74      -log_note "Invoking $FILE_TRUNC with: $options_display"
  75      -log_must $FILE_TRUNC $options $TESTDIR/$TESTFILE
       74 +log_note "Invoking file_trunc with: $options_display"
       75 +log_must file_trunc $options $TESTDIR/$TESTFILE
  76   76  
  77   77  typeset dir=$(get_device_dir $DISKS)
  78   78  verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
  79   79  
  80   80  log_pass "Random blocks have been read back correctly."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX