From nobody Mon Feb 9 06:25:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46C61C001B0 for ; Thu, 10 Aug 2023 11:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234869AbjHJLNb (ORCPT ); Thu, 10 Aug 2023 07:13:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbjHJLN0 (ORCPT ); Thu, 10 Aug 2023 07:13:26 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6282684; Thu, 10 Aug 2023 04:13:24 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6F61A21867; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ySX0bPj+OlMTvPO100mpK3C4LxGQ/kzWWhKoP04YVHk=; b=1KJzQHtd2yEoQ9RANk+oHFA5qS3HkdIzzmFgXLjh8dAw9eWFuFVi/jDftrH9KAOYZXbLn+ NKKH9sFtiPB+PCtZsFSBmf9MQ3pp1cR8IJT+/I8qFhNOF5qYCKas2aeFuCbYG5vVJfYt3u dRldxAeOEY37B2Zy7G/c7y8YjoWhKUM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666003; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ySX0bPj+OlMTvPO100mpK3C4LxGQ/kzWWhKoP04YVHk=; b=DSx1hN/81uIOJzcpJh2ArzA9ZSPo1MDRm9DAVGFwzTkIB+j6sLiaKGSnmXWmUg5uhwPHJN obE+g3Fjp/uL/qDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 54187138E2; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id P/iDFFPG1GQ3LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:23 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v2 02/12] nvme: Reorganize test preamble code section Date: Thu, 10 Aug 2023 13:13:07 +0200 Message-ID: <20230810111317.25273-3-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-1-dwagner@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This unifies all the tests preamble code section. Reorganize all tests to start with printing the test name, then the setting nvmet and finally followed by the variable declarations. Signed-off-by: Daniel Wagner --- tests/nvme/006 | 4 ++-- tests/nvme/007 | 4 ++-- tests/nvme/016 | 4 ++-- tests/nvme/017 | 4 ++-- tests/nvme/030 | 8 ++++---- tests/nvme/031 | 8 ++++---- tests/nvme/033 | 7 ++++--- tests/nvme/034 | 7 ++++--- tests/nvme/035 | 7 ++++--- tests/nvme/036 | 7 ++++--- tests/nvme/037 | 8 ++++---- tests/nvme/038 | 6 +++--- tests/nvme/039 | 4 ++-- tests/nvme/040 | 7 ++++--- tests/nvme/041 | 8 ++++---- tests/nvme/042 | 8 ++++---- tests/nvme/043 | 8 ++++---- tests/nvme/044 | 8 ++++---- tests/nvme/045 | 8 ++++---- tests/nvme/048 | 8 ++++---- 20 files changed, 69 insertions(+), 64 deletions(-) diff --git a/tests/nvme/006 b/tests/nvme/006 index ea0db93791a7..b44c56b6a25d 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -18,12 +18,12 @@ requires() { test() { echo "Running ${TEST_NAME}" =20 + _setup_nvmet + local port local loop_dev local subsys_name=3D"blktests-subsystem-1" =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "$TMPDIR/img" =20 loop_dev=3D"$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/007 b/tests/nvme/007 index 243a79f5a254..112432df7a9d 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -17,12 +17,12 @@ requires() { test() { echo "Running ${TEST_NAME}" =20 + _setup_nvmet + local port local file_path local subsys_name=3D"blktests-subsystem-1" =20 - _setup_nvmet - file_path=3D"${TMPDIR}/img" =20 truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/016 b/tests/nvme/016 index f617cf103900..cac0c0509aca 100755 --- a/tests/nvme/016 +++ b/tests/nvme/016 @@ -16,13 +16,13 @@ requires() { test() { echo "Running ${TEST_NAME}" =20 + _setup_nvmet + local port local iterations=3D"${nvme_num_iter}" local loop_dev local subsys_nqn=3D"blktests-subsystem-1" =20 - _setup_nvmet - loop_dev=3D"$(losetup -f)" local genctr=3D1 =20 diff --git a/tests/nvme/017 b/tests/nvme/017 index 3dbb7c174b56..429a25e8e011 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -16,13 +16,13 @@ requires() { test() { echo "Running ${TEST_NAME}" =20 + _setup_nvmet + local port local file_path local iterations=3D"${nvme_num_iter}" local subsys_name=3D"blktests-subsystem-1" =20 - _setup_nvmet - file_path=3D"${TMPDIR}/img" =20 truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/030 b/tests/nvme/030 index cfcdcbe6be23..a0b999cace94 100755 --- a/tests/nvme/030 +++ b/tests/nvme/030 @@ -16,14 +16,14 @@ requires() { } =20 test() { - local port - local genctr - local subsys=3D"blktests-subsystem-" - echo "Running ${TEST_NAME}" =20 _setup_nvmet =20 + local port + local genctr + local subsys=3D"blktests-subsystem-" + port=3D"$(_create_nvmet_port "${nvme_trtype}")" =20 _create_nvmet_subsystem "${subsys}1" "$(losetup -f)" diff --git a/tests/nvme/031 b/tests/nvme/031 index e70898819a86..27b08e96dd0b 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -24,15 +24,15 @@ requires() { } =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-" local iterations=3D10 local loop_dev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet - truncate -s "${nvme_img_size}" "$TMPDIR/img" =20 loop_dev=3D"$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/033 b/tests/nvme/033 index 90aee817de5d..5a4fac03bea0 100755 --- a/tests/nvme/033 +++ b/tests/nvme/033 @@ -45,13 +45,14 @@ compare_dev_info() { } =20 test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-1" local nsdev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet port=3D$(_nvmet_passthru_target_setup "${subsys}") =20 nsdev=3D$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") diff --git a/tests/nvme/034 b/tests/nvme/034 index e0ede717c373..334b2525d1b6 100755 --- a/tests/nvme/034 +++ b/tests/nvme/034 @@ -15,14 +15,15 @@ requires() { } =20 test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-1" local ctrldev local nsdev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet port=3D$(_nvmet_passthru_target_setup "${subsys}") nsdev=3D$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") =20 diff --git a/tests/nvme/035 b/tests/nvme/035 index 0896f7bb578d..68a9b608920e 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -21,14 +21,15 @@ device_requires() { } =20 test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-1" local ctrldev local nsdev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet port=3D$(_nvmet_passthru_target_setup "${subsys}") nsdev=3D$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") =20 diff --git a/tests/nvme/036 b/tests/nvme/036 index 8218c6538dfd..c3fc5d4a948d 100755 --- a/tests/nvme/036 +++ b/tests/nvme/036 @@ -14,13 +14,14 @@ requires() { } =20 test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-1" local ctrldev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet port=3D$(_nvmet_passthru_target_setup "${subsys}") nsdev=3D$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") =20 diff --git a/tests/nvme/037 b/tests/nvme/037 index fc6c21343652..5a78444b7e78 100755 --- a/tests/nvme/037 +++ b/tests/nvme/037 @@ -13,15 +13,15 @@ requires() { } =20 test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-" local iterations=3D10 local ctrldev local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet - for ((i =3D 0; i < iterations; i++)); do port=3D$(_nvmet_passthru_target_setup "${subsys}${i}") nsdev=3D$(_nvmet_passthru_target_connect "${nvme_trtype}" \ diff --git a/tests/nvme/038 b/tests/nvme/038 index 24f02d4ad4d1..5af28da03c36 100755 --- a/tests/nvme/038 +++ b/tests/nvme/038 @@ -19,13 +19,13 @@ requires() { } =20 test() { - local subsys_path=3D"${NVMET_CFS}/subsystems/blktests-subsystem-1" - local port - echo "Running ${TEST_NAME}" =20 _setup_nvmet =20 + local subsys_path=3D"${NVMET_CFS}/subsystems/blktests-subsystem-1" + local port + mkdir -p "${subsys_path}" rmdir "${subsys_path}" =20 diff --git a/tests/nvme/039 b/tests/nvme/039 index f327b54a8d00..73b53d0b949c 100755 --- a/tests/nvme/039 +++ b/tests/nvme/039 @@ -131,12 +131,12 @@ inject_invalid_admin_cmd() } =20 test_device() { + echo "Running ${TEST_NAME}" + local nvme_verbose_errors local ns_dev local ctrl_dev =20 - echo "Running ${TEST_NAME}" - if _check_kernel_option NVME_VERBOSE_ERRORS; then nvme_verbose_errors=3Dtrue else diff --git a/tests/nvme/040 b/tests/nvme/040 index 688a0939a376..3b76753132f3 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -17,6 +17,10 @@ requires() { } =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys=3D"blktests-subsystem-1" local file_path=3D"${TMPDIR}/img" local port @@ -24,9 +28,6 @@ test() { local nvmedev local fio_pid =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet truncate -s "${nvme_img_size}" "${file_path}" loop_dev=3D"$(losetup -f --show "${file_path}")" =20 diff --git a/tests/nvme/041 b/tests/nvme/041 index 5b04b99b128e..d8937915d622 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -20,6 +20,10 @@ requires() { =20 =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name=3D"blktests-subsystem-1" local hostid @@ -28,8 +32,6 @@ test() { local hostkey local ctrldev =20 - echo "Running ${TEST_NAME}" - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" hostkey=3D"$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" @@ -38,8 +40,6 @@ test() { return 1 fi =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" =20 _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ diff --git a/tests/nvme/042 b/tests/nvme/042 index 8df5ed37aacc..af291cb33a04 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -20,6 +20,10 @@ requires() { =20 =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name=3D"blktests-subsystem-1" local hostid @@ -30,13 +34,9 @@ test() { local hostkey local ctrldev =20 - echo "Running ${TEST_NAME}" - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" =20 _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/043 b/tests/nvme/043 index 8f4b783a02ff..4a37f91e50c3 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -21,6 +21,10 @@ requires() { =20 =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name=3D"blktests-subsystem-1" local hostid @@ -31,8 +35,6 @@ test() { local hostkey local ctrldev =20 - echo "Running ${TEST_NAME}" - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" hostkey=3D"$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" @@ -41,8 +43,6 @@ test() { return 1 fi =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" =20 _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/044 b/tests/nvme/044 index fca0897af27b..27cb343f5ea7 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -21,6 +21,10 @@ requires() { =20 =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name=3D"blktests-subsystem-1" local hostid @@ -30,8 +34,6 @@ test() { local ctrlkey local ctrldev =20 - echo "Running ${TEST_NAME}" - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" =20 @@ -47,8 +49,6 @@ test() { return 1 fi =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" =20 _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/045 b/tests/nvme/045 index eca629a18691..005d62d4f886 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -22,6 +22,10 @@ requires() { =20 =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name=3D"blktests-subsystem-1" local hostid @@ -34,8 +38,6 @@ test() { local ctrldev local rand_io_size =20 - echo "Running ${TEST_NAME}" - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" =20 @@ -51,8 +53,6 @@ test() { return 1 fi =20 - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" =20 _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/048 b/tests/nvme/048 index a6ebb8927865..6efcd7d6ab03 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -81,6 +81,10 @@ set_qid_max() { } =20 test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys_name=3D"blktests-subsystem-1" local cfs_path=3D"${NVMET_CFS}/subsystems/${subsys_name}" local file_path=3D"${TMPDIR}/img" @@ -89,10 +93,6 @@ test() { local hostid local port =20 - echo "Running ${TEST_NAME}" - - _setup_nvmet - hostid=3D"${def_hostid}" hostnqn=3D"${def_hostnqn}" =20 --=20 2.41.0