c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 7001 - zvol_misc tests should not depend on /sbin or /usr/sbin being in PATH

Browse Source 
Authored by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

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.
This commit is contained in:
Hans Rosenfeld 2016-05-26 17:32:26 +02:00 committed by Brian Behlendorf
parent 9060917189
commit 43bd43f9ce
6 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib

1
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib

1
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib

1
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib

1
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib

5
tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2013, 2015 by Delphix. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
# Copyright 2016 Nexenta Systems, Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -44,7 +45,7 @@
verify_runnable "global" verify_runnable "global"
volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL) volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
function cleanup function cleanup
{ {
@ -52,7 +53,7 @@ function cleanup
if [[ $dumpdev != $savedumpdev ]] ; then if [[ $dumpdev != $savedumpdev ]] ; then
safe_dumpadm $savedumpdev safe_dumpadm $savedumpdev
fi fi
zfs set volsize=$volsize $TESTPOOL/$TESTVOL $ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
} }
log_assert "zfs volume as dumpdevice should have 128k volblocksize" log_assert "zfs volume as dumpdevice should have 128k volblocksize"