github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 06:31:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests: ublk: improve test usability

Browse Source 
Add UBLK_TEST_QUIET, so we can print test result(PASS/SKIP/FAIL) only.

Also always run from test script's current directory, then the same test
script can be started from other work directory.

This way helps a lot to reuse this test source code and scripts for
other projects(liburing, blktests, ...)

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250303124324.3563605-12-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ming Lei 2025-03-03 20:43:21 +08:00 committed by Jens Axboe
parent af83ccc7db
commit 390174c91d
8 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/testing/selftests/ublk/test_common.sh
View File

@ -80,7 +80,7 @@ _prep_test() {
local type=$1
shift 1
modprobe ublk_drv
echo "ublk $type: $*"
[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "ublk $type: $*"
}
_remove_test_files()
@ -209,6 +209,12 @@ __run_io_and_remove()
wait
}
_ublk_test_top_dir()
{
cd "$(dirname "$0")" && pwd
}
UBLK_PROG=$(pwd)/kublk
UBLK_PROG=$(_ublk_test_top_dir)/kublk
UBLK_TEST_QUIET=1
export UBLK_PROG
export UBLK_TEST_QUIET

2
tools/testing/selftests/ublk/test_loop_01.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="loop_01"
ERR_CODE=0

2
tools/testing/selftests/ublk/test_loop_02.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="loop_02"
ERR_CODE=0

2
tools/testing/selftests/ublk/test_loop_03.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="loop_03"
ERR_CODE=0

2
tools/testing/selftests/ublk/test_loop_04.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="loop_04"
ERR_CODE=0

2
tools/testing/selftests/ublk/test_null_01.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="null_01"
ERR_CODE=0

4
tools/testing/selftests/ublk/test_stress_01.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="stress_01"
ERR_CODE=0
DEV_ID=-1
@ -17,7 +17,7 @@ ublk_io_and_remove()
DEV_ID=$(_add_ublk_dev "$@")
_check_add_dev $TID $? "${backfile}"
echo "run ublk IO vs. remove device(ublk add $*)"
[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "run ublk IO vs. remove device(ublk add $*)"
if ! __run_io_and_remove "${DEV_ID}" "${size}" "no"; then
echo "/dev/ublkc${DEV_ID} isn't removed"
_remove_backfile "${backfile}"

4
tools/testing/selftests/ublk/test_stress_02.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
. test_common.sh
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
TID="stress_02"
ERR_CODE=0
DEV_ID=-1
@ -17,7 +17,7 @@ ublk_io_and_kill_daemon()
DEV_ID=$(_add_ublk_dev "$@")
_check_add_dev $TID $? "${backfile}"
echo "run ublk IO vs kill ublk server(ublk add $*)"
[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "run ublk IO vs kill ublk server(ublk add $*)"
if ! __run_io_and_remove "${DEV_ID}" "${size}" "yes"; then
echo "/dev/ublkc${DEV_ID} isn't removed res ${res}"
_remove_backfile "${backfile}"