[LTP] [PATCH 3/4] shell: Move mkfs.foo into tst_mkfs()
Petr Vorel
pvorel@suse.cz
Wed Feb 20 17:20:13 CET 2019
+ 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
More information about the ltp
mailing list