[LTP] [PATCH] tst_res: Replace tst_res with tst_brk for shell testcases
Zhao Gongyi
zhaogongyi@huawei.com
Tue Apr 13 13:26:49 CEST 2021
We need replace tst_res with tst_brk to terminate the test immediately since
there is no sence to go on.
For those:
testcases/commands/lsmod/lsmod01.sh
testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
testcases/network/virt/sit01.sh
Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
testcases/commands/lsmod/lsmod01.sh | 3 +--
.../kernel/security/integrity/ima/tests/ima_measurements.sh | 2 +-
testcases/network/virt/sit01.sh | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/testcases/commands/lsmod/lsmod01.sh b/testcases/commands/lsmod/lsmod01.sh
index 2e044c718..44ca59b95 100755
--- a/testcases/commands/lsmod/lsmod01.sh
+++ b/testcases/commands/lsmod/lsmod01.sh
@@ -23,8 +23,7 @@ setup()
tst_require_cmds insmod
insmod "$TST_MODPATH"
if [ $? -ne 0 ]; then
- tst_res TBROK "insmod failed"
- return
+ tst_brk TBROK "insmod failed"
fi
module_inserted=1
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
index 1927e937c..4c8d740b5 100755
--- a/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
+++ b/testcases/kernel/security/integrity/ima/tests/ima_measurements.sh
@@ -35,7 +35,7 @@ ima_check()
algorithm=$(echo "$tmp" | cut -d'|' -f1)
digest=$(echo "$tmp" | cut -d'|' -f2)
else
- tst_res TBROK "failed to get algorithm/digest for '$TEST_FILE': $tmp"
+ tst_brk TBROK "failed to get algorithm/digest for '$TEST_FILE': $tmp"
fi
tst_res TINFO "computing digest for $algorithm algorithm"
diff --git a/testcases/network/virt/sit01.sh b/testcases/network/virt/sit01.sh
index 4ecc1f8c0..27fa0ee77 100755
--- a/testcases/network/virt/sit01.sh
+++ b/testcases/network/virt/sit01.sh
@@ -11,7 +11,7 @@ virt_type="sit"
do_setup()
{
- [ -n "$TST_IPV6" ] && tst_res TBROK "invalid option '-6' for sit tunnel"
+ [ -n "$TST_IPV6" ] && tst_brk TBROK "invalid option '-6' for sit tunnel"
virt_lib_setup
--
2.17.1
More information about the ltp
mailing list