From e0c5a48b3f37cffedb9f720ab3952effb4a8dcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Mon, 17 Jan 2022 16:40:45 +0100 Subject: [PATCH] tests: simplify find_vfstab_dev() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #12979 --- .../cli_root/zpool_add/zpool_add.kshlib | 17 +---------------- .../cli_root/zpool_create/zpool_create.shlib | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib index a7a1fb330..272d0834c 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib @@ -36,28 +36,13 @@ # function find_vfstab_dev { - typeset vfstabdev - typeset vfstabdevs="" - typeset line - if is_illumos; then vfstab="/etc/vfstab" - tmpfile="$TEST_BASE_DIR/vfstab.tmp" else vfstab="/etc/fstab" - tmpfile="$TEST_BASE_DIR/fstab.tmp" fi - cat $vfstab | grep "^${DEV_DSKDIR}" >$tmpfile - while read -r line - do - vfstabdev=`echo "$line" | awk '{print $1}'` - vfstabdev=${vfstabdev%%:} - vfstabdevs="$vfstabdev $vfstabdevs" - done <$tmpfile - - rm -f $tmpfile - echo $vfstabdevs + awk -v pat="^${DEV_DSKDIR}" '$0 ~ pat {sub(/:$/, "", $1); print $1}' $vfstab } # diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib index c98e49518..005cf979b 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib @@ -69,28 +69,13 @@ function create_blockfile # function find_vfstab_dev { - typeset vfstabdev - typeset vfstabdevs="" - typeset line - if is_illumos; then vfstab="/etc/vfstab" - tmpfile="$TEST_BASE_DIR/vfstab.tmp" else vfstab="/etc/fstab" - tmpfile="$TEST_BASE_DIR/fstab.tmp" fi - cat $vfstab | grep "^${DEV_DSKDIR}" >$tmpfile - while read -r line - do - vfstabdev=`echo "$line" | awk '{print $1}'` - vfstabdev=${vfstabdev%%:} - vfstabdevs="$vfstabdev $vfstabdevs" - done <$tmpfile - - rm -f $tmpfile - echo $vfstabdevs + awk -v pat="^${DEV_DSKDIR}" '$0 ~ pat {sub(/:$/, "", $1); print $1}' $vfstab } #