Skip to content

Commit b98fcb6

Browse files
smuppandsmuppand
committed
utils: add emit_result_and_signal() with log_pass/fail/skip wrappers
Introduce emit_result_and_signal() to standardize writing test results to .res files and emitting LAVA-compatible result signals to stderr. This function ensures compatibility with both direct test execution and suite-based runs using run-test.sh. Adds: - emit_result_and_signal(TESTCASE, RESULT) - log_pass_and_emit() - log_fail_and_emit() - log_skip_and_emit() This avoids direct 'echo > .res' in run.sh, enables proper result accumulation, and ensures LAVA signals are robust even under dmesg log flooding. Signed-off-by: Srikanth Muppandam <[email protected]>
1 parent 7433bb9 commit b98fcb6

File tree

31 files changed

+150
-128
lines changed

31 files changed

+150
-128
lines changed

‎Runner/plans/qcom-next-ci-premerge.yaml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,22 @@ run:
1515
steps:
1616
- cd Runner
1717
- $PWD/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/run.sh || true
18-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/adsp_remoteproc/adsp_remoteproc.res || true
1918
- $PWD/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/run.sh || true
20-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/cdsp_remoteproc/cdsp_remoteproc.res || true
2119
- $PWD/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh || true
22-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/CPUFreq_Validation.res || true
2320
- $PWD/suites/Kernel/FunctionalArea/baseport/GIC/run.sh || true
24-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/GIC/GIC.res || true
2521
- $PWD/suites/Kernel/FunctionalArea/baseport/hotplug/run.sh || true
26-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/hotplug/hotplug.res || true
2722
- $PWD/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh || true
28-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Interrupts/Interrupts.res || true
2923
- $PWD/suites/Kernel/FunctionalArea/baseport/irq/run.sh || true
30-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/irq/irq.res || true
3124
- $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh || true
32-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/kaslr.res || true
3325
- $PWD/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh || true
34-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/MEMLAT/MEMLAT.res || true
3526
- $PWD/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh || true
36-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/pinctrl/pinctrl.res || true
3727
- $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh || true
38-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/Reboot_health_check.res || true
3928
- $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh || true
40-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/remoteproc.res || true
4129
- $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh || true
42-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/RMNET.res || true
4330
- $PWD/suites/Kernel/FunctionalArea/baseport/IPA/run.sh || true
44-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/IPA/IPA.res || true
4531
- $PWD/suites/Kernel/FunctionalArea/baseport/Probe_Failure_Check/run.sh || true
46-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Probe_Failure_Check/Probe_Failure_Check.res || true
4732
- $PWD/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh || true
48-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/rngtest/rngtest.res || true
4933
- $PWD/suites/Kernel/FunctionalArea/baseport/smmu/run.sh || true
50-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/smmu/smmu.res || true
5134
- $PWD/suites/Kernel/FunctionalArea/baseport/storage/run.sh || true
52-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/storage/storage.res || true
5335
- $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh || true
54-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/wpss_remoteproc.res || true
5536
- $PWD/utils/result_parse.sh

‎Runner/suites/Kernel/FunctionalArea/DCVS/Freq_Scaling/run.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ check_dependencies zcat grep
4242
CONFIGS="CONFIG_CPU_FREQ CONFIG_CPU_FREQ_GOV_SCHEDUTIL CONFIG_CPU_FREQ_GOV_PERFORMANCE"
4343
check_kernel_config "$CONFIGS" || {
4444
log_fail "Kernel config validation failed."
45-
echo "$TESTNAME FAIL" > "$res_file"
45+
log_fail_and_emit "$TESTNAME"
4646
exit 1
4747
}
4848

@@ -60,7 +60,7 @@ done
6060

6161
if [ "$miss" -eq 1 ]; then
6262
echo "CPUFreq interface not found. Test Failed"
63-
echo "$TESTNAME FAIL" > "$res_file"
63+
log_fail_and_emit "$TESTNAME"
6464
exit 1
6565
fi
6666

@@ -85,11 +85,11 @@ kill $LOAD_PID
8585

8686
if [ "$CURRENT_FREQ" -gt "$MIN_FREQ" ]; then
8787
log_pass "DCVS scaling appears functional. Test Passed"
88-
echo "$TESTNAME PASS" > "$res_file"
88+
log_pass_and_emit "$TESTNAME"
8989
exit 0
9090
else
9191
log_fail "DCVS did not scale as expected. Test Failed"
92-
echo "$TESTNAME FAIL" > "$res_file"
92+
log_fail_and_emit "$TESTNAME"
9393
exit 1
9494
fi
9595

‎Runner/suites/Kernel/FunctionalArea/Scheduler/CPU_affinity/run.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ REQUIRED_CONFIGS="CONFIG_SCHED_DEBUG CONFIG_CGROUP_SCHED CONFIG_SMP"
4343
for config in $REQUIRED_CONFIGS; do
4444
if check_kernel_config "$config"; then
4545
log_pass "$config is enabled"
46-
echo "$TESTNAME PASS" > "$res_file"
46+
log_pass_and_emit "$TESTNAME"
4747
else
4848
log_fail "$config is missing"
49-
echo "$TESTNAME FAIL" > "$res_file"
49+
log_fail_and_emit "$TESTNAME"
5050
exit 1
5151
fi
5252
done
@@ -70,10 +70,10 @@ sleep 1
7070
NEW_AFFINITY=$(taskset -p $TASK_PID | awk -F: '{print $2}' | xargs)
7171
if [ "$NEW_AFFINITY" = "1" ]; then
7272
log_pass "Successfully set CPU affinity"
73-
echo "$TESTNAME PASS" > "$res_file"
73+
log_pass_and_emit "$TESTNAME"
7474
else
7575
log_fail "Failed to set CPU affinity"
76-
echo "$TESTNAME FAIL" > "$res_file"
76+
log_fail_and_emit "$TESTNAME"
7777
fi
7878

7979
log_info "Checking scheduling policy of task..."
@@ -82,11 +82,11 @@ log_info "Scheduling Policy: $SCHED_POLICY"
8282

8383
if echo "$SCHED_POLICY" | grep -q "SCHED_OTHER"; then
8484
log_pass "Default scheduling policy detected. Test passed"
85-
echo "$TESTNAME PASS" > "$res_file"
85+
log_pass_and_emit "$TESTNAME"
8686
exit 0
8787
else
8888
log_fail "Unexpected scheduling policy. Test Failed"
89-
echo "$TESTNAME FAIL" > "$res_file"
89+
log_fail_and_emit "$TESTNAME"
9090
exit 1
9191
fi
9292

‎Runner/suites/Kernel/FunctionalArea/baseport/BWMON/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ done
8282

8383
if $incremented; then
8484
log_pass "$TESTNAME : Test Passed"
85-
echo "$TESTNAME PASS" > "$res_file"
85+
log_pass_and_emit "$TESTNAME"
8686
exit 0
8787
else
8888
log_fail "$TESTNAME : Test Failed"
89-
echo "$TESTNAME FAIL" > "$res_file"
89+
log_fail_and_emit "$TESTNAME"
9090
exit 1
9191
fi
9292
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/FunctionalArea/baseport/Buses/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ output=$(i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
4646

4747
if echo "$output" | grep -q "Reading"; then
4848
log_pass "$TESTNAME : Test Passed"
49-
echo "$TESTNAME PASS" > "$res_file"
49+
log_pass_and_emit "$TESTNAME"
5050
exit 0
5151
else
5252
log_fail "$TESTNAME : Test Failed"
53-
echo "$TESTNAME FAIL" > "$res_file"
53+
log_fail_and_emit "$TESTNAME"
5454
exit 1
5555
fi
5656
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/FunctionalArea/baseport/CPUFreq_Validation/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ log_info ""
108108
log_info "=== Final Result ==="
109109
if [ "$overall_pass" -eq 0 ]; then
110110
log_pass "$TESTNAME: All policies passed"
111-
echo "$TESTNAME PASS" > "$res_file"
111+
log_pass_and_emit "$TESTNAME"
112112
exit 0
113113
else
114114
log_fail "$TESTNAME: One or more policies failed"
115-
echo "$TESTNAME FAIL" > "$res_file"
115+
log_fail_and_emit "$TESTNAME"
116116
exit 1
117117
fi
118118

‎Runner/suites/Kernel/FunctionalArea/baseport/GIC/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ echo "$initial_count" | while read -r line; do
8686
echo $fail_test
8787
if [ "$fail_test" = false ]; then
8888
log_pass "$TESTNAME : Test Passed"
89-
echo "$TESTNAME PASS" > "$res_file"
89+
log_pass_and_emit "$TESTNAME"
9090
exit 0
9191
else
9292
log_fail "$TESTNAME : Test Failed"
93-
echo "$TESTNAME FAIL" > "$res_file"
93+
log_fail_and_emit "$TESTNAME"
9494
exit 1
9595
fi
9696
done

‎Runner/suites/Kernel/FunctionalArea/baseport/IPA/run.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ IPA_MODULE_PATH=$(find_kernel_module "ipa")
4040

4141
if [ -z "$IPA_MODULE_PATH" ]; then
4242
log_error "ipa.ko module not found in filesystem."
43-
echo "$TESTNAME FAIL" > "$res_file"
43+
log_fail_and_emit "$TESTNAME"
4444
exit 1
4545
fi
4646

4747
log_info "Found ipa.ko at: $IPA_MODULE_PATH"
4848

4949
if ! load_kernel_module "$IPA_MODULE_PATH"; then
50-
echo "$TESTNAME FAIL" > "$res_file"
50+
log_fail_and_emit "$TESTNAME"
5151
exit 1
5252
fi
5353

5454
if is_module_loaded "ipa"; then
5555
log_info "ipa module is loaded"
5656
log_pass "$TESTNAME : Test Passed"
57-
echo "$TESTNAME PASS" > "$res_file"
57+
log_pass_and_emit "$TESTNAME"
5858
exit 0
5959
else
6060
log_error "ipa module not listed in lsmod"
6161
log_fail "$TESTNAME : Test Failed"
62-
echo "$TESTNAME FAIL" > "$res_file"
62+
log_fail_and_emit "$TESTNAME"
6363
exit 1
6464
fi
6565

‎Runner/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ count=$(echo "$output" | grep -c "running")
4545

4646
if [ $count -eq 4 ]; then
4747
log_pass "$TESTNAME : Test Passed"
48-
echo "$TESTNAME PASS" > "$res_file"
48+
log_pass_and_emit "$TESTNAME"
4949
exit 0
5050
else
5151
log_fail "$TESTNAME : Test Failed"
52-
echo "$TESTNAME FAIL" > "$res_file"
52+
log_fail_and_emit "$TESTNAME"
5353
exit 1
5454
fi
5555
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/FunctionalArea/baseport/Interrupts/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ echo "$initial_count" | while read -r line; do
8686
echo $fail_test
8787
if [ "$fail_test" = false ]; then
8888
log_pass "$TESTNAME : Test Passed"
89-
echo "$TESTNAME PASS" > "$res_file"
89+
log_pass_and_emit "$TESTNAME"
9090
exit 0
9191
else
9292
log_fail "$TESTNAME : Test Failed"
93-
echo "$TESTNAME FAIL" > "$res_file"
93+
log_fail_and_emit "$TESTNAME"
9494
exit 1
9595
fi
9696
done

0 commit comments

Comments
 (0)