From 730306502db604fb753317949e1b9959ebe1bd35 Mon Sep 17 00:00:00 2001 From: liudanning Date: Mon, 25 Jul 2022 14:58:58 +0800 Subject: [PATCH 1/2] kernel_linux_build:fix testcases sched_rtg04 && mem_debug10 Signed-off-by: liudanning --- .../mem_debug_t/testcases/bin/mem_debug10.sh | 2 +- .../sched_rtg_t/testcases/bin/sched_rtg04.sh | 30 ++++--------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/test/moduletest/runtest/bin/mem_debug_t/testcases/bin/mem_debug10.sh b/test/moduletest/runtest/bin/mem_debug_t/testcases/bin/mem_debug10.sh index 38c2f03..9b7524c 100644 --- a/test/moduletest/runtest/bin/mem_debug_t/testcases/bin/mem_debug10.sh +++ b/test/moduletest/runtest/bin/mem_debug_t/testcases/bin/mem_debug10.sh @@ -39,7 +39,7 @@ do_setup() do_test() { - set_check_lmkd_oom_score_adj -1001 1 0 + set_check_lmkd_oom_score_adj -1001 1 $lmkd_oom_score_adj_def set_check_lmkd_oom_score_adj -1000 0 -1000 set_check_lmkd_oom_score_adj 1 0 1 set_check_lmkd_oom_score_adj 1000 0 1000 diff --git a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg04.sh b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg04.sh index 0f77902..06de2a2 100644 --- a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg04.sh +++ b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg04.sh @@ -29,41 +29,23 @@ source tst_oh.sh do_setup() { - cpu_value=$(cat /sys/kernel/debug/tracing/events/rtg/find_rtg_cpu/enable) - - aa start -b ohos.samples.ecg -a ohos.samples.ecg.MainAbility - sleep 1 - PID=$(ps -ef | grep ohos.samples.ecg | grep -v grep | awk '{print $2}') - echo 1 > /sys/kernel/debug/tracing/events/rtg/find_rtg_cpu/enable } do_test() { - local res=0 - local sched_group_id=/proc/$PID/sched_group_id - - tst_res TINFO "Start sched RTG trace catching test ..." - bytrace -t 10 -b 32000 --overwrite sched ace app disk ohos graphic sync workq ability > rtgtrace.ftrace & - tst_res TINFO "Checking sched RTG trace ..." - sleep 3 - for i in $(seq 1 50);do - echo 0 > $sched_group_id - echo 2 > $sched_group_id - done - sleep 50 - cat rtgtrace.ftrace | grep "find_rtg_cpu" + ls /sys/kernel/debug/tracing/events/rtg/ | grep find_rtg_cpu && + ls /sys/kernel/debug/tracing/events/rtg/ | grep sched_rtg_task_each && + ls /sys/kernel/debug/tracing/events/rtg/ | grep sched_rtg_valid_normalized_util if [ $? -eq 0 ]; then - tst_res TPASS "trace info found." - rm -rf rtgtrace.ftrace + tst_res TPASS "trace nodes are existed" else - tst_res TFAIL "trace info no found!" + tst_res TFAIL "trace nodes are not existed" fi } do_clean() { - echo $cpu_value > /sys/kernel/debug/tracing/events/rtg/find_rtg_cpu/enable - aa force-stop ohos.samples.ecg + } do_setup -- Gitee From b5fe6bc01932e5e8dacc05ba6ee2b7dbc3c61ff6 Mon Sep 17 00:00:00 2001 From: liudanning Date: Mon, 25 Jul 2022 15:21:31 +0800 Subject: [PATCH 2/2] www Signed-off-by: liudanning --- test/lll/www.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/lll/www.txt diff --git a/test/lll/www.txt b/test/lll/www.txt new file mode 100644 index 0000000..baf12b4 --- /dev/null +++ b/test/lll/www.txt @@ -0,0 +1 @@ +www \ No newline at end of file -- Gitee