From 4cb4fdc5c1202574fb994798f0ac2df31fbcb35d Mon Sep 17 00:00:00 2001 From: propelluo Date: Mon, 4 Aug 2025 15:11:30 +0800 Subject: [PATCH 1/2] skip if no TPM device Signed-off-by: propelluo --- testcase/tpm_tools/ltp.tpm_tools.tpm01.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm02.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm03.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm04.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm05.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm06.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpm07.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpmtoken01.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpmtoken02.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpmtoken03.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpmtoken04.sh | 3 ++- testcase/tpm_tools/ltp.tpm_tools.tpmtoken05.sh | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm01.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm01.sh index cfef637..dde9716 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm01.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm01.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm02.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm02.sh index 913690d..30dfdfa 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm02.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm02.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm03.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm03.sh index 9c5ee84..f56c8f0 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm03.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm03.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm04.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm04.sh index 146d890..f4a6921 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm04.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm04.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm05.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm05.sh index 15f149c..f09de07 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm05.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm05.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm06.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm06.sh index d3cbd90..cfccf48 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm06.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm06.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpm07.sh b/testcase/tpm_tools/ltp.tpm_tools.tpm07.sh index 2ed125b..6a96c2a 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpm07.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpm07.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken01.sh b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken01.sh index 0c69ab3..bb6a887 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken01.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken01.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken02.sh b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken02.sh index de81a37..020c119 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken02.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken02.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken03.sh b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken03.sh index 7cb59cb..e15e3ea 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken03.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken03.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken04.sh b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken04.sh index 3a2dad5..3ce22ba 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken04.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken04.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } diff --git a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken05.sh b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken05.sh index 1d8e070..c65881e 100755 --- a/testcase/tpm_tools/ltp.tpm_tools.tpmtoken05.sh +++ b/testcase/tpm_tools/ltp.tpm_tools.tpmtoken05.sh @@ -16,7 +16,8 @@ source "${TST_TS_TOPDIR}/common/lib/common.sh" || exit 1 tc_setup() { msg "this is tc_setup" - # @预置条件: + # @预置条件: 有tpm设备 + skip_if_false ls /dev/tpm* return 0 } -- Gitee From c7567202b247b3f89a8c8c36f943ba3a952235db Mon Sep 17 00:00:00 2001 From: propelluo Date: Wed, 20 Aug 2025 21:54:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=BA4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: propelluo --- .../ltp.controllers.memcg_move_charge_at_immigrate.sh | 4 ++-- testcase/controllers/ltp.controllers.memcg_stat.sh | 4 ++-- testcase/controllers/ltp.controllers.memcg_stat_rss.sh | 4 ++-- testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip4t.sh | 2 +- testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip6t.sh | 2 +- testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip4t.sh | 2 +- testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip6t.sh | 2 +- testcase/syscalls/ltp.syscalls.finit_module01.sh | 4 ++-- testcase/syscalls/ltp.syscalls.init_module01.sh | 4 ++-- testcase/syscalls/ltp.syscalls.init_module02.sh | 4 ++-- testcase/syscalls/ltp.syscalls.splice07.sh | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/testcase/controllers/ltp.controllers.memcg_move_charge_at_immigrate.sh b/testcase/controllers/ltp.controllers.memcg_move_charge_at_immigrate.sh index 1e75f38..7d841c7 100755 --- a/testcase/controllers/ltp.controllers.memcg_move_charge_at_immigrate.sh +++ b/testcase/controllers/ltp.controllers.memcg_move_charge_at_immigrate.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-212948-982709455 # @用例名称: ltp.controllers.memcg_move_charge_at_immigrate -# @用例级别: 1 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/controllers/ltp.controllers.memcg_stat.sh b/testcase/controllers/ltp.controllers.memcg_stat.sh index e91638a..be7acc8 100755 --- a/testcase/controllers/ltp.controllers.memcg_stat.sh +++ b/testcase/controllers/ltp.controllers.memcg_stat.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-212948-999740519 # @用例名称: ltp.controllers.memcg_stat -# @用例级别: 1 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/controllers/ltp.controllers.memcg_stat_rss.sh b/testcase/controllers/ltp.controllers.memcg_stat_rss.sh index 5dc7d9d..ebfd94f 100755 --- a/testcase/controllers/ltp.controllers.memcg_stat_rss.sh +++ b/testcase/controllers/ltp.controllers.memcg_stat_rss.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-212948-956914119 # @用例名称: ltp.controllers.memcg_stat_rss -# @用例级别: 1 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip4t.sh b/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip4t.sh index cc13544..41ea6f1 100755 --- a/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip4t.sh +++ b/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip4t.sh @@ -2,7 +2,7 @@ ############################################################################### # @用例ID: 20240719-172834-591140181 # @用例名称: ltp.net.nfs.nfs09_v30_ip4t -# @用例级别: 3 +# @用例级别: 4 # @用例标签: 待分析 # @扩展属性: # @用例类型: 功能测试 diff --git a/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip6t.sh b/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip6t.sh index 2a71f04..5bef40f 100755 --- a/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip6t.sh +++ b/testcase/net.nfs/ltp.net.nfs.nfs09_v30_ip6t.sh @@ -2,7 +2,7 @@ ############################################################################### # @用例ID: 20240719-172834-974245259 # @用例名称: ltp.net.nfs.nfs09_v30_ip6t -# @用例级别: 3 +# @用例级别: 4 # @用例标签: 待分析 # @扩展属性: # @用例类型: 功能测试 diff --git a/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip4t.sh b/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip4t.sh index 92cdd0a..587b354 100755 --- a/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip4t.sh +++ b/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip4t.sh @@ -2,7 +2,7 @@ ############################################################################### # @用例ID: 20240719-172835-345239769 # @用例名称: ltp.net.nfs.nfslock01_v30_ip4t -# @用例级别: 3 +# @用例级别: 4 # @用例标签: 待分析 # @扩展属性: # @用例类型: 功能测试 diff --git a/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip6t.sh b/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip6t.sh index 3243820..71c267c 100755 --- a/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip6t.sh +++ b/testcase/net.nfs/ltp.net.nfs.nfslock01_v30_ip6t.sh @@ -2,7 +2,7 @@ ############################################################################### # @用例ID: 20240719-172835-723830638 # @用例名称: ltp.net.nfs.nfslock01_v30_ip6t -# @用例级别: 3 +# @用例级别: 4 # @用例标签: 待分析 # @扩展属性: # @用例类型: 功能测试 diff --git a/testcase/syscalls/ltp.syscalls.finit_module01.sh b/testcase/syscalls/ltp.syscalls.finit_module01.sh index fb05f13..1cf1f91 100755 --- a/testcase/syscalls/ltp.syscalls.finit_module01.sh +++ b/testcase/syscalls/ltp.syscalls.finit_module01.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-213014-375229999 # @用例名称: ltp.syscalls.finit_module01 -# @用例级别: 3 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/syscalls/ltp.syscalls.init_module01.sh b/testcase/syscalls/ltp.syscalls.init_module01.sh index 47414fe..d680529 100755 --- a/testcase/syscalls/ltp.syscalls.init_module01.sh +++ b/testcase/syscalls/ltp.syscalls.init_module01.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-213015-744727984 # @用例名称: ltp.syscalls.init_module01 -# @用例级别: 3 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/syscalls/ltp.syscalls.init_module02.sh b/testcase/syscalls/ltp.syscalls.init_module02.sh index 21a4dc7..eb5c44f 100755 --- a/testcase/syscalls/ltp.syscalls.init_module02.sh +++ b/testcase/syscalls/ltp.syscalls.init_module02.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20220630-213015-753904087 # @用例名称: ltp.syscalls.init_module02 -# @用例级别: 3 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @用例类型: 功能测试 # @自动化: 1 ############################################################################### diff --git a/testcase/syscalls/ltp.syscalls.splice07.sh b/testcase/syscalls/ltp.syscalls.splice07.sh index c33dc5e..2afdc7c 100755 --- a/testcase/syscalls/ltp.syscalls.splice07.sh +++ b/testcase/syscalls/ltp.syscalls.splice07.sh @@ -2,8 +2,8 @@ ############################################################################### # @用例ID: 20240719-172840-208100205 # @用例名称: ltp.syscalls.splice07 -# @用例级别: 3 -# @用例标签: +# @用例级别: 4 +# @用例标签: 待分析 # @扩展属性: # @用例类型: 功能测试 # @自动化: 1 -- Gitee