Add one wrapper script for using rublk to run ublk tests, and prefer to rublk because it is well implemented and more reliable. This way has been run for months in rublk's github CI test. https://github.com/ming1/rublk Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx> --- README.md | 1 + src/rublk_wrapper.sh | 31 +++++++++++++++++++++++++++++++ tests/ublk/rc | 6 +++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100755 src/rublk_wrapper.sh diff --git a/README.md b/README.md index b6445d6..313a3cc 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Some tests require the following: - multipath-tools (Debian, openSUSE, Arch Linux) or device-mapper-multipath (Fedora) - dmsetup (Debian) or device-mapper (Fedora, openSUSE, Arch Linux) +- rublk (`cargo install --version=0.1.2 rublk`) for ublk test Build blktests with `make`. Optionally, install it to a known location with `make install` (`/usr/local/blktests` by default, but this can be changed by diff --git a/src/rublk_wrapper.sh b/src/rublk_wrapper.sh new file mode 100755 index 0000000..803743e --- /dev/null +++ b/src/rublk_wrapper.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2023 Ming Lei <ming.lei@xxxxxxxxxx> +# +# rublk wrapper for adapting miniublk's command line + +PARA="" +ACT=$1 +for arg in $@; do + if [ "$arg" = "-t" ]; then + continue + fi + + if [ "$ACT" = "recover" ]; then + if [ "$arg" = "loop" ] || [ "$arg" = "null" ]; then + continue; + fi + + if [ -f "$arg" ]; then + continue + fi + + if [ "$arg" = "-f" ]; then + continue + fi + PARA+=" $arg" + else + PARA+=" $arg" + fi +done +rublk $PARA diff --git a/tests/ublk/rc b/tests/ublk/rc index c553296..5fbf861 100644 --- a/tests/ublk/rc +++ b/tests/ublk/rc @@ -14,4 +14,8 @@ group_requires() { _have_fio } -export UBLK_PROG="src/miniublk" +if which rublk > /dev/null 2>&1; then + export UBLK_PROG="src/rublk_wrapper.sh" +else + export UBLK_PROG="src/miniublk" +fi -- 2.41.0
