From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Date: Tue, 23 Apr 2024 04:35:26 +0000 (+0900)
Subject: block/033: additional fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2525de37aa0db54d5a44f93e63cb1ee1ce5a73ea;p=users%2Fsagi%2Fblktests.git

block/033: additional fix

The previous commit moved the UBLK_PROG definition from tests/ublk/rc to
common/ublk end. Move that again from common/ublk end to start. Also,
the UBLK_PROG local variable in block/033 is no longer required. Remove
it.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---

diff --git a/common/ublk b/common/ublk
index c065db2..7f12b81 100644
--- a/common/ublk
+++ b/common/ublk
@@ -6,6 +6,12 @@
 
 . common/shellcheck
 
+if which rublk > /dev/null 2>&1; then
+	export UBLK_PROG="src/rublk_wrapper.sh"
+else
+	export UBLK_PROG="src/miniublk"
+fi
+
 _have_ublk() {
 	_have_driver ublk_drv
 	_have_program "${UBLK_PROG}"
@@ -40,9 +46,3 @@ _exit_ublk() {
 	udevadm settle
 	modprobe -r -q ublk_drv
 }
-
-if which rublk > /dev/null 2>&1; then
-	export UBLK_PROG="src/rublk_wrapper.sh"
-else
-	export UBLK_PROG="src/miniublk"
-fi
diff --git a/tests/block/033 b/tests/block/033
index 510e1c5..d91d426 100755
--- a/tests/block/033
+++ b/tests/block/033
@@ -17,8 +17,6 @@ requires() {
 }
 
 test() {
-	local UBLK_PROG="src/miniublk"
-
 	echo "Running ${TEST_NAME}"
 
 	if ! _init_ublk; then