diff options
| author | Hans Rosenfeld <[email protected]> | 2016-05-26 17:32:26 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-15 17:30:27 -0800 |
| commit | 43bd43f9ce3bb690be3bc83f9797c7fce01c6047 (patch) | |
| tree | 4432d88d9c876060fc5282658e27362188a2b560 | |
| parent | 906091718936ded06aeef49096964b6fba1e2475 (diff) | |
OpenZFS 7001 - zvol_misc tests should not depend on /sbin or /usr/sbin being in PATH
Authored by: Hans Rosenfeld <[email protected]>
Reviewed by: Toomas Soome <[email protected]>
Reviewed by: Igor Kozhukhov <[email protected]>
Approved by: Dan McDonald <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7001
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/258c9c7
Closes #5801
Porting notes:
- Most of the changes were previously applied.
6 files changed, 8 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh index eff2745f5..7b53a4e73 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh index 8cf1e8704..d3fdefb6b 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh index 1913a75a3..321ddabb6 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh index 9a3632aac..b78dd269a 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh index a566f9f80..df6e8f729 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh index 0298c6893..53e822a10 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh @@ -27,6 +27,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . $STF_SUITE/include/libtest.shlib @@ -44,7 +45,7 @@ verify_runnable "global" -volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL) +volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL) function cleanup { @@ -52,7 +53,7 @@ function cleanup if [[ $dumpdev != $savedumpdev ]] ; then safe_dumpadm $savedumpdev fi - zfs set volsize=$volsize $TESTPOOL/$TESTVOL + $ZFS set volsize=$volsize $TESTPOOL/$TESTVOL } log_assert "zfs volume as dumpdevice should have 128k volblocksize" |