From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 3/4] shell: Move mkfs.foo into tst_mkfs()
Date: Wed, 20 Feb 2019 17:20:13 +0100 [thread overview]
Message-ID: <20190220162014.5467-3-pvorel@suse.cz> (raw)
In-Reply-To: <20190220162014.5467-1-pvorel@suse.cz>
+ remove unused local ret
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
testcases/commands/df/df01.sh | 6 ------
testcases/kernel/security/integrity/ima/tests/ima_setup.sh | 1 -
testcases/lib/tst_test.sh | 3 ++-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/testcases/commands/df/df01.sh b/testcases/commands/df/df01.sh
index 4f77500b8..b93fb7ad7 100755
--- a/testcases/commands/df/df01.sh
+++ b/testcases/commands/df/df01.sh
@@ -49,12 +49,6 @@ parse_args()
setup()
{
- local ret
-
- if [ -n "$FS_TYPE" ]; then
- tst_test_cmds mkfs.${FS_TYPE}
- fi
-
tst_mkfs $FS_TYPE $TST_DEVICE
tst_mount
DF_FS_TYPE=$(mount | grep "$TST_DEVICE" | awk '{print $5}')
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
index e51d3d70b..e000390e4 100644
--- a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
+++ b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
@@ -53,7 +53,6 @@ mount_loop_device()
{
local ret
- tst_test_cmds mkfs.$FS_TYPE
tst_mkfs $FS_TYPE $TST_DEVICE
tst_mount
cd $TST_MOUNT
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index 4abea6665..9ac45e04a 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -296,8 +296,9 @@ tst_mkfs()
tst_brk TBROK "No device specified"
fi
- tst_res TINFO "Formatting $device with $fs_type extra opts='$fs_opts'"
+ tst_test_cmds mkfs.$fs_type
+ tst_res TINFO "Formatting $device with $fs_type extra opts='$fs_opts'"
ROD_SILENT mkfs.$fs_type $fs_opts $device
}
--
2.20.1
next prev parent reply other threads:[~2019-02-20 16:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 16:20 [LTP] [PATCH 1/4] shell: Add tst_mount() helper Petr Vorel
2019-02-20 16:20 ` [LTP] [PATCH 2/4] ima, commands/{df,mkfs}: Use tst_mount Petr Vorel
2019-02-20 16:20 ` Petr Vorel [this message]
2019-03-13 14:01 ` [LTP] [PATCH 3/4] shell: Move mkfs.foo into tst_mkfs() Cyril Hrubis
2019-02-20 16:20 ` [LTP] [PATCH 4/4] shell: Use $FS_TYPE and $TST_DEVICE as default params in tst_mkfs() Petr Vorel
2019-03-13 14:03 ` Cyril Hrubis
2019-03-13 15:19 ` Petr Vorel
2019-03-13 13:58 ` [LTP] [PATCH 1/4] shell: Add tst_mount() helper Cyril Hrubis
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=20190220162014.5467-3-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=ltp@lists.linux.it \
/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