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/nopwrite/nopwrite_sync.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh
↓ open down ↓ 4 lines elided ↑ open up ↑
   5    5  # Common Development and Distribution License ("CDDL"), version 1.0.
   6    6  # You may only use this file in accordance with the terms of version
   7    7  # 1.0 of the CDDL.
   8    8  #
   9    9  # A full copy of the text of the CDDL should have accompanied this
  10   10  # source.  A copy of the CDDL is also available via the Internet at
  11   11  # http://www.illumos.org/license/CDDL.
  12   12  #
  13   13  
  14   14  #
  15      -# Copyright (c) 2012 by Delphix. All rights reserved.
       15 +# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  16   16  #
  17   17  
  18   18  . $STF_SUITE/include/libtest.shlib
  19   19  . $STF_SUITE/tests/functional/nopwrite/nopwrite.shlib
  20   20  
  21   21  #
  22   22  # Description:
  23   23  # Verify that nopwrite works for sync writes
  24   24  #
  25   25  # Strategy:
↓ open down ↓ 1 lines elided ↑ open up ↑
  27   27  # 2. Clone origin such that it inherits the properies.
  28   28  # 3. Use dd with the sync flag to test the sync write path.
  29   29  #
  30   30  
  31   31  verify_runnable "global"
  32   32  origin="$TESTPOOL/$TESTFS"
  33   33  log_onexit cleanup
  34   34  
  35   35  function cleanup
  36   36  {
  37      -        datasetexists $origin && log_must $ZFS destroy -R $origin
  38      -        log_must $ZFS create -o mountpoint=$TESTDIR $origin
       37 +        datasetexists $origin && log_must zfs destroy -R $origin
       38 +        log_must zfs create -o mountpoint=$TESTDIR $origin
  39   39  }
  40   40  
  41   41  log_assert "nopwrite works for sync writes"
  42   42  
  43      -log_must $ZFS set compress=on $origin
  44      -log_must $ZFS set checksum=sha256 $origin
  45      -$GNUDD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \
       43 +log_must zfs set compress=on $origin
       44 +log_must zfs set checksum=sha256 $origin
       45 +gnu_dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \
  46   46      conv=notrunc >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
  47      -$ZFS snapshot $origin@a || log_fail "zfs snap failed"
  48      -log_must $ZFS clone $origin@a $origin/clone
       47 +zfs snapshot $origin@a || log_fail "zfs snap failed"
       48 +log_must zfs clone $origin@a $origin/clone
  49   49  
  50      -$GNUDD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
       50 +gnu_dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
  51   51      oflag=sync conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
  52   52  
  53   53  log_must verify_nopwrite $origin $origin@a $origin/clone
  54   54  
  55   55  log_pass "nopwrite works for sync writes"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX