ZTS: Eliminate partitioning from write_dirs
These tests do not need to use partitions. Get rid of the partitioning and just use the disks directly. Reviewed-by: John Kennedy <john.kennedy@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #9995
This commit is contained in:
parent
5ceccda5cb
commit
3e725f0ad2
|
@ -4,6 +4,3 @@ dist_pkgdata_SCRIPTS = \
|
||||||
cleanup.ksh \
|
cleanup.ksh \
|
||||||
write_dirs_001_pos.ksh \
|
write_dirs_001_pos.ksh \
|
||||||
write_dirs_002_pos.ksh
|
write_dirs_002_pos.ksh
|
||||||
|
|
||||||
dist_pkgdata_DATA = \
|
|
||||||
write_dirs.cfg
|
|
||||||
|
|
|
@ -30,6 +30,5 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
. $STF_SUITE/include/libtest.shlib
|
. $STF_SUITE/include/libtest.shlib
|
||||||
. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg
|
|
||||||
|
|
||||||
default_cleanup
|
default_cleanup
|
||||||
|
|
|
@ -30,18 +30,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
. $STF_SUITE/include/libtest.shlib
|
. $STF_SUITE/include/libtest.shlib
|
||||||
. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg
|
|
||||||
|
|
||||||
verify_runnable "global"
|
verify_runnable "global"
|
||||||
|
|
||||||
if ! is_physical_device $DISKS; then
|
default_setup $DISKS
|
||||||
log_unsupported "This directory cannot be run on raw files."
|
|
||||||
fi
|
|
||||||
|
|
||||||
DISK=${DISKS%% *}
|
|
||||||
if is_mpath_device $DISK; then
|
|
||||||
delete_partitions
|
|
||||||
fi
|
|
||||||
log_must set_partition 0 "" $SIZE $DISK
|
|
||||||
|
|
||||||
default_setup "${DISK}${SLICE_PREFIX}${SLICE}"
|
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
#
|
|
||||||
# CDDL HEADER START
|
|
||||||
#
|
|
||||||
# The contents of this file are subject to the terms of the
|
|
||||||
# Common Development and Distribution License (the "License").
|
|
||||||
# You may not use this file except in compliance with the License.
|
|
||||||
#
|
|
||||||
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
||||||
# or http://www.opensolaris.org/os/licensing.
|
|
||||||
# See the License for the specific language governing permissions
|
|
||||||
# and limitations under the License.
|
|
||||||
#
|
|
||||||
# When distributing Covered Code, include this CDDL HEADER in each
|
|
||||||
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
||||||
# If applicable, add the following below this CDDL HEADER, with the
|
|
||||||
# fields enclosed by brackets "[]" replaced with your own identifying
|
|
||||||
# information: Portions Copyright [yyyy] [name of copyright owner]
|
|
||||||
#
|
|
||||||
# CDDL HEADER END
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
|
|
||||||
# Use is subject to license terms.
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright (c) 2013 by Delphix. All rights reserved.
|
|
||||||
#
|
|
||||||
|
|
||||||
. $STF_SUITE/include/libtest.shlib
|
|
||||||
|
|
||||||
verify_runnable "global"
|
|
||||||
|
|
||||||
export SIZE="1gb"
|
|
||||||
export DISK_ARRAY_NUM=$(echo ${DISKS} | nawk '{print NF}')
|
|
||||||
export DISKSARRAY=$DISKS
|
|
||||||
|
|
||||||
if is_linux; then
|
|
||||||
set_slice_prefix
|
|
||||||
set_device_dir
|
|
||||||
export SLICE=1
|
|
||||||
else
|
|
||||||
export SLICE=0
|
|
||||||
fi
|
|
|
@ -30,7 +30,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
. $STF_SUITE/include/libtest.shlib
|
. $STF_SUITE/include/libtest.shlib
|
||||||
. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# DESCRIPTION:
|
# DESCRIPTION:
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
. $STF_SUITE/include/libtest.shlib
|
. $STF_SUITE/include/libtest.shlib
|
||||||
. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# DESCRIPTION:
|
# DESCRIPTION:
|
||||||
|
|
Loading…
Reference in New Issue