diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-14 14:03:06 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-14 14:03:06 +0000 |
| commit | eb8f6f014c29ae7a6650458f49da8960ed82bfcf (patch) | |
| tree | d8cc134dc1a4d3119493593b836822d612768dc5 /usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib | |
| parent | 91b5490a419451a7a9fad5fff2b5f1f83ad87955 (diff) | |
| parent | 1d32ba663e202c24a5a1f2e5aef83fffb447cb7f (diff) | |
| download | illumos-joyent-eb8f6f014c29ae7a6650458f49da8960ed82bfcf.tar.gz | |
[illumos-gate merge]
commit 1d32ba663e202c24a5a1f2e5aef83fffb447cb7f
7290 ZFS test suite needs to control what utilities it can run
commit f4fb84c03b3f4c46dab36872e953dd3c27317c3a
7576 Print the correct size of loader.efi when failing to load it into memory.
commit 40510e8eba18690b9a9843b26393725eeb0f1dac
6676 Race between unique_insert() and unique_remove() causes ZFS fsid change
Diffstat (limited to 'usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib')
| -rw-r--r-- | usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib b/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib index ef367e1dba..26b56f68e5 100644 --- a/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib +++ b/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib @@ -25,7 +25,7 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib @@ -33,10 +33,10 @@ function cleanup { if datasetexists $TESTPOOL ; then - log_must $ZPOOL destroy -f $TESTPOOL + log_must zpool destroy -f $TESTPOOL fi if datasetexists $TESTPOOL2 ; then - log_must $ZPOOL destroy -f $TESTPOOL2 + log_must zpool destroy -f $TESTPOOL2 fi } @@ -50,17 +50,17 @@ function display_status typeset pool=$1 typeset -i ret=0 - $ZPOOL status -xv $pool > /dev/null 2>&1 + zpool status -xv $pool > /dev/null 2>&1 ret=$? - $ZPOOL iostat > /dev/null 2>&1 + zpool iostat > /dev/null 2>&1 ((ret |= $?)) typeset mntpnt=$(get_prop mountpoint $pool) - $DD if=/dev/random of=$mntpnt/testfile.$$ & + dd if=/dev/random of=$mntpnt/testfile.$$ & typeset pid=$! - $ZPOOL iostat -v 1 3 > /dev/null + zpool iostat -v 1 3 > /dev/null ((ret |= $?)) kill -9 $pid @@ -93,7 +93,7 @@ function verify_cache_device # # mirror:/disks/d ONLINE mirror:/disks/e ONLINE stripe:/disks/f ONLINE # - set -A dev_stat_tab $($ZPOOL status -v $pool | $NAWK 'BEGIN {start=0} \ + set -A dev_stat_tab $(zpool status -v $pool | nawk 'BEGIN {start=0} \ /\tcache/ {start=1} /\tmirror/ || /\tspares/ || /^$/ {start=0} (start==1) && /\t (\/|[a-zA-Z])/ \ @@ -148,6 +148,6 @@ function verify_cache_device function verify_cache_support { - $ZPOOL upgrade -v | $GREP "Cache devices" > /dev/null 2>&1 + zpool upgrade -v | grep "Cache devices" > /dev/null 2>&1 return $? } |