From 3e725f0ad2d379f3bff42ac3127a5948226274fd Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 13 Feb 2020 15:08:59 -0500 Subject: 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 Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #9995 --- .../tests/functional/write_dirs/Makefile.am | 3 -- .../tests/functional/write_dirs/cleanup.ksh | 1 - .../tests/functional/write_dirs/setup.ksh | 13 +------ .../tests/functional/write_dirs/write_dirs.cfg | 45 ---------------------- .../functional/write_dirs/write_dirs_001_pos.ksh | 1 - .../functional/write_dirs/write_dirs_002_pos.ksh | 1 - 6 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg (limited to 'tests/zfs-tests') diff --git a/tests/zfs-tests/tests/functional/write_dirs/Makefile.am b/tests/zfs-tests/tests/functional/write_dirs/Makefile.am index 267a5d1d1..9bdc46b90 100644 --- a/tests/zfs-tests/tests/functional/write_dirs/Makefile.am +++ b/tests/zfs-tests/tests/functional/write_dirs/Makefile.am @@ -4,6 +4,3 @@ dist_pkgdata_SCRIPTS = \ cleanup.ksh \ write_dirs_001_pos.ksh \ write_dirs_002_pos.ksh - -dist_pkgdata_DATA = \ - write_dirs.cfg diff --git a/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh b/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh index 50526153e..3166bd6ec 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh @@ -30,6 +30,5 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg default_cleanup diff --git a/tests/zfs-tests/tests/functional/write_dirs/setup.ksh b/tests/zfs-tests/tests/functional/write_dirs/setup.ksh index 156c31662..3aafdbdb3 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/setup.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/setup.ksh @@ -30,18 +30,7 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg verify_runnable "global" -if ! is_physical_device $DISKS; then - 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}" +default_setup $DISKS diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg b/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg deleted file mode 100644 index 356e454a5..000000000 --- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg +++ /dev/null @@ -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 diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh index 1835eb366..60da382ca 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh @@ -30,7 +30,6 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg # # DESCRIPTION: diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh index 9f0b3f3cd..dcb793e1f 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh @@ -30,7 +30,6 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/write_dirs/write_dirs.cfg # # DESCRIPTION: -- cgit v1.2.3