From: Ming Lei <ming.lei@redhat.com>
Date: Mon, 13 Nov 2023 13:35:03 +0000 (+0800)
Subject: common/ublk: allow to run ublk test without building miniublk
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a046a7c18efd2dd475c658d63f9bc37ceb014078;p=users%2Fsagi%2Fblktests.git

common/ublk: allow to run ublk test without building miniublk

Now `rublk` is enough for supporting ublk test, not necessary to build
miniublk any more.

Convert ublk common helpers into ${UBLK_PROG}.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
[Shin'ichiro: fixed a shellcheck warning]
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---

diff --git a/common/ublk b/common/ublk
index 8278d56..c4d1e34 100644
--- a/common/ublk
+++ b/common/ublk
@@ -8,19 +8,19 @@
 
 _have_ublk() {
 	_have_driver ublk_drv
-	_have_src_program miniublk
+	_have_program "${UBLK_PROG}"
 }
 
 _remove_ublk_devices() {
-	src/miniublk del -a
+	${UBLK_PROG} del -a
 }
 
 _get_ublk_dev_state() {
-	src/miniublk list -n "$1" | grep "state" | awk '{print $11}'
+	${UBLK_PROG} list -n "$1" | grep "state" | awk '{print $11}'
 }
 
 _get_ublk_daemon_pid() {
-	src/miniublk list -n "$1" | grep "pid" | awk '{print $7}'
+	${UBLK_PROG} list -n "$1" | grep "pid" | awk '{print $7}'
 }
 
 _init_ublk() {