Print this page
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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib
          +++ new/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib
↓ open down ↓ 18 lines elided ↑ open up ↑
  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  #
  33   33  # A function to determine if a given pool name has an entry in cachefile
  34   34  # returns 1 if the pool is not in the cache, 0 otherwise.
  35   35  function pool_in_cache {
  36   36  
  37   37          # checking for the pool name in the strings output of
  38   38          # the given cachefile, default is /etc/zfs/zpool.cache
  39   39          typeset cachefile=${2:-$CPATH}
  40   40  
  41      -        RESULT=$($STRINGS $cachefile | $GREP -w $1)
       41 +        RESULT=$(strings $cachefile | grep -w $1)
  42   42          if [ -z "$RESULT" ]
  43   43          then
  44   44                  return 1
  45   45          fi
  46   46          return 0
  47   47  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX