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/slog/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/slog/setup.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  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, 2015 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/slog/slog.cfg
  34   34  
  35   35  verify_runnable "global"
  36   36  
  37   37  if ! verify_slog_support ; then
  38   38          log_unsupported "This system doesn't support separate intent logs"
  39   39  fi
  40   40  
  41   41  if [[ -d $VDEV ]]; then
  42      -        log_must $RM -rf $VDIR
       42 +        log_must rm -rf $VDIR
  43   43  fi
  44   44  if [[ -d $VDEV2 ]]; then
  45      -        log_must $RM -rf $VDIR2
       45 +        log_must rm -rf $VDIR2
  46   46  fi
  47      -log_must $MKDIR -p $VDIR $VDIR2
  48      -log_must $MKFILE $MINVDEVSIZE $VDEV $SDEV $LDEV $VDEV2 $SDEV2 $LDEV2
       47 +log_must mkdir -p $VDIR $VDIR2
       48 +log_must mkfile $MINVDEVSIZE $VDEV $SDEV $LDEV $VDEV2 $SDEV2 $LDEV2
  49   49  
  50   50  log_pass
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX