Print this page
12181 zvol swap tests should avoid grep -w

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
↓ open down ↓ 20 lines elided ↑ open up ↑
  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   29  # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  # Copyright 2016 Nexenta Systems, Inc.
       31 +# Copyright 2020 Joyent, Inc.
  31   32  #
  32   33  
  33   34  . $STF_SUITE/include/libtest.shlib
  34   35  . $STF_SUITE/tests/functional/zvol/zvol_common.shlib
  35   36  
  36   37  #
  37   38  # DESCRIPTION:
  38   39  # Verify the ability to take snapshots of zvols used as dump or swap.
  39   40  #
  40   41  # STRATEGY:
↓ open down ↓ 6 lines elided ↑ open up ↑
  47   48  
  48   49  volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
  49   50  
  50   51  function cleanup
  51   52  {
  52   53          typeset dumpdev=$(get_dumpdevice)
  53   54          if [[ $dumpdev != $savedumpdev ]] ; then
  54   55                  safe_dumpadm $savedumpdev
  55   56          fi
  56   57  
  57      -        swap -l | grep -w $voldev > /dev/null 2>&1
       58 +        swap -l | awk 'NR > 1 { print $1 }' | \
       59 +            grep "^$voldev\$" > /dev/null 2>&1
  58   60          if (( $? == 0 ));  then
  59   61                  log_must swap -d $voldev
  60   62          fi
  61   63  
  62   64          typeset snap
  63   65          for snap in snap0 snap1 ; do
  64   66                  if datasetexists $TESTPOOL/$TESTVOL@$snap ; then
  65   67                          log_must zfs destroy $TESTPOOL/$TESTVOL@$snap
  66   68                  fi
  67   69          done
↓ open down ↓ 46 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX