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/compression/compress_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/compression/compress_002_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 2007 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/compression/compress.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # Create two files of exactly the same size. One with compression
  38   38  # and one without. Ensure the compressed file is smaller.
  39   39  #

  40   40  # NOTE: This test uses a dataset rather than a simple file system.
  41   41  #
  42   42  # STRATEGY:
  43   43  # Create a dataset, turn on compression and create files before

  44   44  # and after the property change. The compressed file should be smaller.
  45   45  #
  46   46  
  47   47  verify_runnable "both"
  48   48  
  49   49  typeset OP=create
  50   50  
  51   51  log_assert "Ensure that compressed files in a dataset are smaller."
  52   52  
  53   53  log_note "Ensure compression is off"
  54      -log_must $ZFS set compression=off $TESTPOOL/$TESTCTR
       54 +log_must zfs set compression=off $TESTPOOL/$TESTCTR
  55   55  
  56   56  log_note "Writing file without compression..."
  57      -log_must $FILE_WRITE -o $OP -f $TESTDIR1/$TESTFILE0 -b $BLOCKSZ \
       57 +log_must file_write -o $OP -f $TESTDIR1/$TESTFILE0 -b $BLOCKSZ \
  58   58      -c $NUM_WRITES -d $DATA
  59   59  
  60   60  log_note "Add compression property to the dataset and write another file"
  61      -log_must $ZFS set compression=on $TESTPOOL/$TESTCTR
       61 +log_must zfs set compression=on $TESTPOOL/$TESTCTR
  62   62  
  63      -log_must $FILE_WRITE -o $OP -f $TESTDIR1/$TESTFILE1 -b $BLOCKSZ \
       63 +log_must file_write -o $OP -f $TESTDIR1/$TESTFILE1 -b $BLOCKSZ \
  64   64      -c $NUM_WRITES -d $DATA
  65   65  
  66      -$SLEEP 60
       66 +sleep 60
  67   67  
  68      -FILE0_BLKS=`$DU -k $TESTDIR1/$TESTFILE0 | $AWK '{ print $1}'`
  69      -FILE1_BLKS=`$DU -k $TESTDIR1/$TESTFILE1 | $AWK '{ print $1}'`
       68 +FILE0_BLKS=`du -k $TESTDIR1/$TESTFILE0 | awk '{ print $1}'`
       69 +FILE1_BLKS=`du -k $TESTDIR1/$TESTFILE1 | awk '{ print $1}'`
  70   70  
  71   71  if [[ $FILE0_BLKS -le $FILE1_BLKS ]]; then
  72   72          log_fail "$TESTFILE0 is smaller than $TESTFILE1" \
  73   73                          "($FILE0_BLKS <= $FILE1_BLKS)"
  74   74  fi
  75   75  
  76   76  log_pass "$TESTFILE0 is bigger than $TESTFILE1 ($FILE0_BLKS > $FILE1_BLKS)"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX