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>
Subject: [PATCH blktests 01/11] check: factor out _run_test()
Date: Thu, 11 Apr 2024 20:12:18 +0900 [thread overview]
Message-ID: <20240411111228.2290407-2-shinichiro.kawasaki@wdc.com> (raw)
In-Reply-To: <20240411111228.2290407-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().
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---
check | 90 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 53 insertions(+), 37 deletions(-)
diff --git a/check b/check
index 55871b0..b1f5212 100755
--- a/check
+++ b/check
@@ -463,6 +463,56 @@ _unload_modules() {
unset MODULES_TO_UNLOAD
}
+_check_and_call_test() {
+ 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
+
+ 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 +532,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 +555,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-11 11:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 11:12 [PATCH blktests 00/11] support test case repeat by different conditions Shin'ichiro Kawasaki
2024-04-11 11:12 ` Shin'ichiro Kawasaki [this message]
[not found] ` <CGME20240411134129epcas5p3f28e625fc48b93a1f492547a6f4ff894@epcas5p3.samsung.com>
2024-04-11 13:34 ` [PATCH blktests 01/11] check: factor out _run_test() Nitesh Shetty
2024-04-12 10:59 ` Shinichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 02/11] check: support test case repeat by different conditions Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 03/11] check: use set_conditions() for the CAN_BE_ZONED test cases Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 04/11] meta/{016,017}: add test cases to check repeated test case runs Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 05/11] nvme/rc: introduce NVMET_TR_TYPES Shin'ichiro Kawasaki
2024-04-11 18:41 ` Daniel Wagner
2024-04-12 10:56 ` Shinichiro Kawasaki
2024-04-16 5:20 ` Shinichiro Kawasaki
2024-04-16 10:28 ` Shinichiro Kawasaki
2024-04-16 16:23 ` Daniel Wagner
2024-04-16 18:43 ` Chaitanya Kulkarni
2024-04-17 0:58 ` Shinichiro Kawasaki
2024-04-17 6:06 ` Daniel Wagner
2024-04-18 6:12 ` Chaitanya Kulkarni
2024-04-18 6:36 ` Daniel Wagner
2024-04-18 7:18 ` Chaitanya Kulkarni
2024-04-24 8:55 ` Shinichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 06/11] nvme/rc: add blkdev type environment variable Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 07/11] nvme/rc: introduce NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-11 18:44 ` Daniel Wagner
2024-04-12 10:56 ` Shinichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 08/11] nvme/{002-031,033-038,040-045,047,048}: support NMVET_TR_TYPES Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 09/11] nvme/{006,008,010,012,014,019,023}: support NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 10/11] nvme/{007,009,011,013,015,020,024}: drop duplicate nvmet blkdev type tests Shin'ichiro Kawasaki
2024-04-11 11:12 ` [PATCH blktests 11/11] nvme/{021,022,025,026,027,028}: do not hard code target blkdev type Shin'ichiro Kawasaki
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=20240411111228.2290407-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 \
/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 NNTP newsgroup(s).