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/migration/migration.cfg
          +++ new/usr/src/test/zfs-tests/tests/functional/migration/migration.cfg
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  
  27   27  #
  28      -# Copyright (c) 2013 by Delphix. All rights reserved.
       28 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  29   29  #
  30   30  
  31   31  . $STF_SUITE/include/libtest.shlib
  32   32  
  33   33  set -A disk_array $(find_disks $DISKS)
  34   34  case "${#disk_array[*]}" in
  35   35  0)
  36   36          DISK_COUNT=0
  37   37          ;;
  38   38  1)
↓ open down ↓ 12 lines elided ↑ open up ↑
  51   51          NONZFS_DISK=${disk_array[1]}
  52   52          ZFSSIDE_DISK=${ZFS_DISK}s0
  53   53          NONZFSSIDE_DISK=${NONZFS_DISK}s0
  54   54          ;;
  55   55  esac
  56   56  
  57   57  export DISK_COUNT ZFS_DISK NONZFS_DISK SINGLE_DISK ZFSSIDE_DISK NONZFSSIDE_DISK
  58   58  
  59   59  export TESTFILE=/etc/passwd
  60   60  export NONZFS_TESTDIR=$TESTDIR/nonzfstestdir
  61      -tmp=`$SUM $TESTFILE`
  62      -export SUMA=`$ECHO $tmp | $AWK '{print $1}'`
  63      -export SUMB=`$ECHO $tmp | $AWK '{print $2}'`
       61 +tmp=`sum $TESTFILE`
       62 +export SUMA=`echo $tmp | awk '{print $1}'`
       63 +export SUMB=`echo $tmp | awk '{print $2}'`
  64   64  export FS_SIZE=1g
  65      -export BNAME=`$BASENAME $TESTFILE`
  66      -export DNAME=`$DIRNAME $TESTFILE`
       65 +export BNAME=`basename $TESTFILE`
       66 +export DNAME=`dirname $TESTFILE`
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX