From db385dba82e77fe32fbe77ff2ea39865d34aca78 Mon Sep 17 00:00:00 2001 From: liudanning Date: Thu, 25 Aug 2022 11:21:04 +0800 Subject: [PATCH] kernel_linux_build:modify sched_rtg02&&sched_rtg03 for More accurate detection Signed-off-by: liudanning --- .../runtest/bin/sched_rtg_t/testcases/bin/sched_rtg02.sh | 7 ++++--- .../runtest/bin/sched_rtg_t/testcases/bin/sched_rtg03.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg02.sh b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg02.sh index 631283d..5d565a5 100644 --- a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg02.sh +++ b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg02.sh @@ -31,9 +31,9 @@ source tst_oh.sh do_setup() { - aa start -b ohos.samples.ecg -a ohos.samples.ecg.MainAbility + sh create_process.sh 1 sleep 1 - PID=$(ps -ef | grep ohos.samples.ecg | grep -v grep | awk '{print $2}') + PID=$(ps -ef | grep "create_process" | grep -v grep | awk '{print $2}') } do_test() @@ -89,7 +89,8 @@ set_check_rtgid() do_clean() { - aa force-stop ohos.samples.ecg + ps -ef | grep "create_process" | grep -v "grep" | cut -c 9-18 \ + | xargs kill -9 } do_setup diff --git a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg03.sh b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg03.sh index f0fa3bb..c64f1ed 100644 --- a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg03.sh +++ b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg03.sh @@ -71,7 +71,7 @@ set_check_rtgid_debug() tst_res TFAIL "process $_pid rtgid set to $_set_rtgid unexpected!" fi - local _rtg_id=$(cat /proc/sched_rtg_debug | grep RTG_ID | grep -v grep | awk '{print $3}') + local _rtg_id=$(cat /proc/sched_rtg_debug | grep RTG_ID | grep -v grep | awk '{print $3}' | head -n 1) local _rtg_pid=$(cat /proc/sched_rtg_debug | grep $PID | grep -v grep | awk '{print $3}') if [ $_set_rtgid -ne 0 ]; then if [ $_rtg_id -eq $_expect_rtgid ]; then -- Gitee