`which` stopped being installed by default in recent distros, and it is not needed at all. Use the POSIX `command -v` instead.
Drop a doubled "unless" from the POSIX compliant note. Signed-off-by: Martin Pitt <[email protected]> --- tests/Makefile.am | 2 +- tests/common/rc | 8 ++++---- tests/erofs/028 | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f109b8..c0291ac 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,7 +137,7 @@ TESTS += erofs/031 # NOTE: When adding a new test case or updating an existing one, please write # POSIX-compliant shell scripts and avoid using Linux-specific features unless -# unless the test case is expected to run only on Linux platforms. +# the test case is expected to run only on Linux platforms. EXTRA_DIST = common/rc erofs diff --git a/tests/common/rc b/tests/common/rc index 78e704d..aa7ef99 100644 --- a/tests/common/rc +++ b/tests/common/rc @@ -48,10 +48,10 @@ _fatal() exit 1 } -export MOUNT_PROG="$(which mount)" +export MOUNT_PROG="$(command -v mount)" [ "$MOUNT_PROG" = "" ] && _fatal "mount not found" -export UMOUNT_PROG="$(which umount)" +export UMOUNT_PROG="$(command -v umount)" [ "$UMOUNT_PROG" = "" ] && _fatal "umount not found" [ "$MKFS_EROFS_PROG" = "" ] && _fatal "mkfs.erofs not found" @@ -94,7 +94,7 @@ _require_root() _require_xattr() { - which setfattr >/dev/null 2>&1 || + command -v setfattr >/dev/null 2>&1 || _notrun "attr isn't installed, skipped." } @@ -309,7 +309,7 @@ _do_unmount() { local mnt_path=$1 - if [ "$FSTYP" = "erofsfuse" -a "$(which fusermount > /dev/null && echo ok)" = "ok" ]; then + if [ "$FSTYP" = "erofsfuse" ] && command -v fusermount > /dev/null 2>&1; then fusermount -u $mnt_path else $UMOUNT_PROG $mnt_path diff --git a/tests/erofs/028 b/tests/erofs/028 index bf31c3f..05d9a5e 100755 --- a/tests/erofs/028 +++ b/tests/erofs/028 @@ -42,9 +42,9 @@ check_ishare() _require_erofs _require_erofs_inode_sharing _require_erofs_compression "-zlz4" -which strace > /dev/null 2>&1 || _notrun "strace is not found" -which fincore > /dev/null 2>&1 || _notrun "fincore is not found" -which fadvise > /dev/null 2>&1 || _notrun "fadvise is not found" +command -v strace > /dev/null 2>&1 || _notrun "strace is not found" +command -v fincore > /dev/null 2>&1 || _notrun "fincore is not found" +command -v fadvise > /dev/null 2>&1 || _notrun "fadvise is not found" # remove previous $seqres.full before test rm -f $seqres.full -- 2.55.0
