From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
To: linux-block@vger.kernel.org
Cc: linux-nvme@lists.infradead.org, Daniel Wagner <dwagern@suse.de>,
Chaitanya Kulkarni <kch@nvidia.com>,
Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH blktests v3 01/15] check: factor out _run_test()
Date: Wed, 24 Apr 2024 16:59:41 +0900 [thread overview]
Message-ID: <20240424075955.3604997-2-shinichiro.kawasaki@wdc.com> (raw)
In-Reply-To: <20240424075955.3604997-1-shinichiro.kawasaki@wdc.com>
The function _run_test() is rather complex and has deep nests. Before
modifying it for repeated test case runs, simplify it. Factor out some
part of the function to the new functions _check_and_call_test() and
_check_and_call_test_device().
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Acked-by: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---
check | 93 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 56 insertions(+), 37 deletions(-)
diff --git a/check b/check
index 55871b0..7d09ec0 100755
--- a/check
+++ b/check
@@ -463,6 +463,59 @@ _unload_modules() {
unset MODULES_TO_UNLOAD
}
+_check_and_call_test() {
+ local ret
+
+ if declare -fF requires >/dev/null; then
+ requires
+ fi
+
+ RESULTS_DIR="$OUTPUT/nodev"
+ _call_test test
+ ret=$?
+ if (( RUN_ZONED_TESTS && CAN_BE_ZONED )); then
+ RESULTS_DIR="$OUTPUT/nodev_zoned"
+ RUN_FOR_ZONED=1
+ _call_test test
+ ret=$(( ret || $? ))
+ fi
+
+ return $ret
+}
+
+_check_and_call_test_device() {
+ local unset_skip_reason
+ local ret
+
+ if declare -fF requires >/dev/null; then
+ requires
+ fi
+
+ for TEST_DEV in "${TEST_DEVS[@]}"; do
+ TEST_DEV_SYSFS="${TEST_DEV_SYSFS_DIRS["$TEST_DEV"]}"
+ TEST_DEV_PART_SYSFS="${TEST_DEV_PART_SYSFS_DIRS["$TEST_DEV"]}"
+
+ unset_skip_reason=0
+ if [[ ! -v SKIP_REASONS ]]; then
+ unset_skip_reason=1
+ if (( !CAN_BE_ZONED )) && _test_dev_is_zoned; then
+ SKIP_REASONS+=("${TEST_DEV} is a zoned block device")
+ elif declare -fF device_requires >/dev/null; then
+ device_requires
+ fi
+ fi
+ RESULTS_DIR="$OUTPUT/$(basename "$TEST_DEV")"
+ if ! _call_test test_device; then
+ ret=1
+ fi
+ if (( unset_skip_reason )); then
+ unset SKIP_REASONS
+ fi
+ done
+
+ return $ret
+}
+
_run_test() {
TEST_NAME="$1"
CAN_BE_ZONED=0
@@ -482,19 +535,8 @@ _run_test() {
. "tests/${TEST_NAME}"
if declare -fF test >/dev/null; then
- if declare -fF requires >/dev/null; then
- requires
- fi
-
- RESULTS_DIR="$OUTPUT/nodev"
- _call_test test
+ _check_and_call_test
ret=$?
- if (( RUN_ZONED_TESTS && CAN_BE_ZONED )); then
- RESULTS_DIR="$OUTPUT/nodev_zoned"
- RUN_FOR_ZONED=1
- _call_test test
- ret=$(( ret || $? ))
- fi
else
if [[ ${#TEST_DEVS[@]} -eq 0 ]] && \
declare -fF fallback_device >/dev/null; then
@@ -516,31 +558,8 @@ _run_test() {
return 0
fi
- if declare -fF requires >/dev/null; then
- requires
- fi
-
- for TEST_DEV in "${TEST_DEVS[@]}"; do
- TEST_DEV_SYSFS="${TEST_DEV_SYSFS_DIRS["$TEST_DEV"]}"
- TEST_DEV_PART_SYSFS="${TEST_DEV_PART_SYSFS_DIRS["$TEST_DEV"]}"
-
- local unset_skip_reason=0
- if [[ ! -v SKIP_REASONS ]]; then
- unset_skip_reason=1
- if (( !CAN_BE_ZONED )) && _test_dev_is_zoned; then
- SKIP_REASONS+=("${TEST_DEV} is a zoned block device")
- elif declare -fF device_requires >/dev/null; then
- device_requires
- fi
- fi
- RESULTS_DIR="$OUTPUT/$(basename "$TEST_DEV")"
- if ! _call_test test_device; then
- ret=1
- fi
- if (( unset_skip_reason )); then
- unset SKIP_REASONS
- fi
- done
+ _check_and_call_test_device
+ ret=$?
if (( FALLBACK_DEVICE )); then
cleanup_fallback_device
--
2.44.0
next prev parent reply other threads:[~2024-04-24 8:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 7:59 [PATCH blktests v3 00/15] support test case repeat by different conditions Shin'ichiro Kawasaki
2024-04-24 7:59 ` Shin'ichiro Kawasaki [this message]
2024-04-24 7:59 ` [PATCH blktests v3 02/15] check: " Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 03/15] check: use set_conditions() for the CAN_BE_ZONED test cases Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 04/15] meta/{016,017}: add test cases to check repeated test case runs Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 05/15] common/rc: introduce _check_conflict_and_set_default() Shin'ichiro Kawasaki
2024-04-24 12:27 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 06/15] nvme/rc: introduce NVMET_TRTYPES Shin'ichiro Kawasaki
2024-04-24 12:28 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 07/15] nvme/rc: add blkdev type environment variable Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 08/15] nvme/rc: introduce NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 09/15] nvme/{002-031,033-038,040-045,047,048}: support NMVET_TRTYPES Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 10/15] nvme/{006,008,010,012,014,019,023}: support NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-28 8:58 ` Sagi Grimberg
2024-04-28 10:32 ` Shinichiro Kawasaki
2024-04-28 13:12 ` Sagi Grimberg
2024-04-28 23:58 ` Shinichiro Kawasaki
2024-04-30 12:00 ` Sagi Grimberg
2024-05-03 6:23 ` Shinichiro Kawasaki
2024-05-03 7:33 ` Sagi Grimberg
2024-04-24 7:59 ` [PATCH blktests v3 11/15] nvme/{007,009,011,013,015,020,024}: drop duplicate nvmet blkdev type tests Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 12/15] nvme/{021,022,025,026,027,028}: do not hard code target blkdev type Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 13/15] nvme/{rc,010,017,031,034,035}: rename nvme_img_size to NVME_IMG_SIZE Shin'ichiro Kawasaki
2024-04-24 12:29 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 14/15] nvme/{rc,016,017}: rename nvme_num_iter to NVME_NUM_ITER Shin'ichiro Kawasaki
2024-04-24 12:30 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 15/15] nvme/rc,srp/rc,common/multipath-over-rdma: rename use_rxe to USE_RXE Shin'ichiro Kawasaki
2024-04-24 12:33 ` Daniel Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424075955.3604997-2-shinichiro.kawasaki@wdc.com \
--to=shinichiro.kawasaki@wdc.com \
--cc=dwagern@suse.de \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).