From 592cf7f1e23280ab3f02b649fdcda75b72d16729 Mon Sep 17 00:00:00 2001
From: наб <nabijaczleweli@nabijaczleweli.xyz>
Date: Wed, 9 Mar 2022 13:52:14 +0100
Subject: tests: get rid of which
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13259
---
 tests/zfs-tests/include/commands.cfg  | 3 +--
 tests/zfs-tests/include/libtest.shlib | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests/zfs-tests/include')

diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg
index 50449633a..a5ee92071 100644
--- a/tests/zfs-tests/include/commands.cfg
+++ b/tests/zfs-tests/include/commands.cfg
@@ -109,8 +109,7 @@ export SYSTEM_FILES_COMMON='arp
     uuidgen
     vmstat
     wait
-    wc
-    which'
+    wc'
 
 export SYSTEM_FILES_FREEBSD='chflags
     compress
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index a78c10ce2..f786f05e8 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -2618,7 +2618,7 @@ function add_user_linux #<group_name> <user_name> <basedir>
 	# Add new users to the same group and the command line utils.
 	# This allows them to be run out of the original users home
 	# directory as long as it permissioned to be group readable.
-	cmd_group=$(stat --format="%G" $(which zfs))
+	cmd_group=$(stat --format="%G" $(command -v zfs))
 	log_must usermod -a -G $cmd_group $user
 
 	return 0
-- 
cgit v1.2.3