Skip to content

Commit 02037b8

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 6c0969a commit 02037b8

File tree

32 files changed

+146
-158
lines changed

32 files changed

+146
-158
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,24 @@ 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/suites/Kernel/FunctionalArea/DCVS/Freq_Scaling/run.sh || true
56-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/DCVS/Freq_Scaling/Freq_Scaling.res || true
5737
- $PWD/suites/Kernel/FunctionalArea/Scheduler/CPU_affinity/run.sh || true
58-
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/Scheduler/CPU_affinity/CPU_affinity.res || true
5938
- $PWD/utils/result_parse.sh

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ TESTNAME="Freq_Scaling"
3232
test_path=$(find_test_case_by_name "$TESTNAME")
3333
cd "$test_path" || exit 1
3434
# shellcheck disable=SC2034
35-
res_file="./$TESTNAME.res"
3635

3736
log_info "-------------------------------------------------"
3837
log_info "----------- Starting $TESTNAME Test -------------"
@@ -42,7 +41,7 @@ check_dependencies zcat grep
4241
CONFIGS="CONFIG_CPU_FREQ CONFIG_CPU_FREQ_GOV_SCHEDUTIL CONFIG_CPU_FREQ_GOV_PERFORMANCE"
4342
check_kernel_config "$CONFIGS" || {
4443
log_fail "Kernel config validation failed."
45-
echo "$TESTNAME FAIL" > "$res_file"
44+
log_fail_and_emit "$TESTNAME"
4645
exit 1
4746
}
4847

@@ -60,7 +59,7 @@ done
6059

6160
if [ "$miss" -eq 1 ]; then
6261
echo "CPUFreq interface not found. Test Failed"
63-
echo "$TESTNAME FAIL" > "$res_file"
62+
log_fail_and_emit "$TESTNAME"
6463
exit 1
6564
fi
6665

@@ -85,11 +84,11 @@ kill $LOAD_PID
8584

8685
if [ "$CURRENT_FREQ" -gt "$MIN_FREQ" ]; then
8786
log_pass "DCVS scaling appears functional. Test Passed"
88-
echo "$TESTNAME PASS" > "$res_file"
87+
log_pass_and_emit "$TESTNAME"
8988
exit 0
9089
else
9190
log_fail "DCVS did not scale as expected. Test Failed"
92-
echo "$TESTNAME FAIL" > "$res_file"
91+
log_fail_and_emit "$TESTNAME"
9392
exit 1
9493
fi
9594

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ TESTNAME="CPU_affinity"
3232
test_path=$(find_test_case_by_name "$TESTNAME")
3333
cd "$test_path" || exit 1
3434
# shellcheck disable=SC2034
35-
res_file="./$TESTNAME.res"
3635

3736
log_info "----------------------------------------------------"
3837
log_info "-------- Starting $TESTNAME Functional Test --------"
@@ -43,10 +42,10 @@ REQUIRED_CONFIGS="CONFIG_CGROUP_SCHED CONFIG_SMP"
4342
for config in $REQUIRED_CONFIGS; do
4443
if check_kernel_config "$config"; then
4544
log_pass "$config is enabled"
46-
echo "$TESTNAME PASS" > "$res_file"
45+
log_pass_and_emit "$TESTNAME"
4746
else
4847
log_fail "$config is missing"
49-
echo "$TESTNAME FAIL" > "$res_file"
48+
log_fail_and_emit "$TESTNAME"
5049
exit 1
5150
fi
5251
done
@@ -70,10 +69,10 @@ sleep 1
7069
NEW_AFFINITY=$(taskset -p $TASK_PID | awk -F: '{print $2}' | xargs)
7170
if [ "$NEW_AFFINITY" = "1" ]; then
7271
log_pass "Successfully set CPU affinity"
73-
echo "$TESTNAME PASS" > "$res_file"
72+
log_pass_and_emit "$TESTNAME"
7473
else
7574
log_fail "Failed to set CPU affinity"
76-
echo "$TESTNAME FAIL" > "$res_file"
75+
log_fail_and_emit "$TESTNAME"
7776
fi
7877

7978
log_info "Checking scheduling policy of task..."
@@ -82,11 +81,11 @@ log_info "Scheduling Policy: $SCHED_POLICY"
8281

8382
if echo "$SCHED_POLICY" | grep -q "SCHED_OTHER"; then
8483
log_pass "Default scheduling policy detected. Test passed"
85-
echo "$TESTNAME PASS" > "$res_file"
84+
log_pass_and_emit "$TESTNAME"
8685
exit 0
8786
else
8887
log_fail "Unexpected scheduling policy. Test Failed"
89-
echo "$TESTNAME FAIL" > "$res_file"
88+
log_fail_and_emit "$TESTNAME"
9089
exit 1
9190
fi
9291

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ TESTNAME="BWMON"
3333
test_path=$(find_test_case_by_name "$TESTNAME")
3434
cd "$test_path" || exit 1
3535
# shellcheck disable=SC2034
36-
res_file="./$TESTNAME.res"
3736

3837
log_info "-----------------------------------------------------------------------------------------"
3938
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -82,11 +81,11 @@ done
8281

8382
if $incremented; then
8483
log_pass "$TESTNAME : Test Passed"
85-
echo "$TESTNAME PASS" > "$res_file"
84+
log_pass_and_emit "$TESTNAME"
8685
exit 0
8786
else
8887
log_fail "$TESTNAME : Test Failed"
89-
echo "$TESTNAME FAIL" > "$res_file"
88+
log_fail_and_emit "$TESTNAME"
9089
exit 1
9190
fi
9291
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ TESTNAME="Buses"
3232
test_path=$(find_test_case_by_name "$TESTNAME")
3333
cd "$test_path" || exit 1
3434
# shellcheck disable=SC2034
35-
res_file="./$TESTNAME.res"
3635

3736
log_info "-----------------------------------------------------------------------------------------"
3837
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -46,11 +45,11 @@ output=$(i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
4645

4746
if echo "$output" | grep -q "Reading"; then
4847
log_pass "$TESTNAME : Test Passed"
49-
echo "$TESTNAME PASS" > "$res_file"
48+
log_pass_and_emit "$TESTNAME"
5049
exit 0
5150
else
5251
log_fail "$TESTNAME : Test Failed"
53-
echo "$TESTNAME FAIL" > "$res_file"
52+
log_fail_and_emit "$TESTNAME"
5453
exit 1
5554
fi
5655
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ fi
3030
TESTNAME="CPUFreq_Validation"
3131
test_path=$(find_test_case_by_name "$TESTNAME")
3232
cd "$test_path" || exit 1
33-
res_file="./$TESTNAME.res"
3433

3534
log_info "------------------------------------------------------------"
3635
log_info "Starting $TESTNAME Testcase"
@@ -108,11 +107,11 @@ log_info ""
108107
log_info "=== Final Result ==="
109108
if [ "$overall_pass" -eq 0 ]; then
110109
log_pass "$TESTNAME: All policies passed"
111-
echo "$TESTNAME PASS" > "$res_file"
110+
log_pass_and_emit "$TESTNAME"
112111
exit 0
113112
else
114113
log_fail "$TESTNAME: One or more policies failed"
115-
echo "$TESTNAME FAIL" > "$res_file"
114+
log_fail_and_emit "$TESTNAME"
116115
exit 1
117116
fi
118117

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ TESTNAME="GIC"
3333
test_path=$(find_test_case_by_name "$TESTNAME")
3434
cd "$test_path" || exit 1
3535
# shellcheck disable=SC2034
36-
res_file="./$TESTNAME.res"
3736

3837
log_info "-----------------------------------------------------------------------------------------"
3938
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -86,11 +85,11 @@ echo "$initial_count" | while read -r line; do
8685
echo $fail_test
8786
if [ "$fail_test" = false ]; then
8887
log_pass "$TESTNAME : Test Passed"
89-
echo "$TESTNAME PASS" > "$res_file"
88+
log_pass_and_emit "$TESTNAME"
9089
exit 0
9190
else
9291
log_fail "$TESTNAME : Test Failed"
93-
echo "$TESTNAME FAIL" > "$res_file"
92+
log_fail_and_emit "$TESTNAME"
9493
exit 1
9594
fi
9695
done

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ fi
3030
TESTNAME="IPA"
3131
test_path=$(find_test_case_by_name "$TESTNAME")
3232
cd "$test_path" || exit 1
33-
res_file="./$TESTNAME.res"
3433

3534
log_info "-----------------------------------------------------------------------------------------"
3635
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -40,26 +39,26 @@ IPA_MODULE_PATH=$(find_kernel_module "ipa")
4039

4140
if [ -z "$IPA_MODULE_PATH" ]; then
4241
log_error "ipa.ko module not found in filesystem."
43-
echo "$TESTNAME FAIL" > "$res_file"
42+
log_fail_and_emit "$TESTNAME"
4443
exit 1
4544
fi
4645

4746
log_info "Found ipa.ko at: $IPA_MODULE_PATH"
4847

4948
if ! load_kernel_module "$IPA_MODULE_PATH"; then
50-
echo "$TESTNAME FAIL" > "$res_file"
49+
log_fail_and_emit "$TESTNAME"
5150
exit 1
5251
fi
5352

5453
if is_module_loaded "ipa"; then
5554
log_info "ipa module is loaded"
5655
log_pass "$TESTNAME : Test Passed"
57-
echo "$TESTNAME PASS" > "$res_file"
56+
log_pass_and_emit "$TESTNAME"
5857
exit 0
5958
else
6059
log_error "ipa module not listed in lsmod"
6160
log_fail "$TESTNAME : Test Failed"
62-
echo "$TESTNAME FAIL" > "$res_file"
61+
log_fail_and_emit "$TESTNAME"
6362
exit 1
6463
fi
6564

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ TESTNAME="IPCC"
3333
test_path=$(find_test_case_by_name "$TESTNAME")
3434
cd "$test_path" || exit 1
3535
# shellcheck disable=SC2034
36-
res_file="./$TESTNAME.res"
3736

3837
log_info "-----------------------------------------------------------------------------------------"
3938
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -45,11 +44,11 @@ count=$(echo "$output" | grep -c "running")
4544

4645
if [ $count -eq 4 ]; then
4746
log_pass "$TESTNAME : Test Passed"
48-
echo "$TESTNAME PASS" > "$res_file"
47+
log_pass_and_emit "$TESTNAME"
4948
exit 0
5049
else
5150
log_fail "$TESTNAME : Test Failed"
52-
echo "$TESTNAME FAIL" > "$res_file"
51+
log_fail_and_emit "$TESTNAME"
5352
exit 1
5453
fi
5554
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ TESTNAME="Interrupts"
3333
test_path=$(find_test_case_by_name "$TESTNAME")
3434
cd "$test_path" || exit 1
3535
# shellcheck disable=SC2034
36-
res_file="./$TESTNAME.res"
3736

3837
log_info "-----------------------------------------------------------------------------------------"
3938
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -86,11 +85,11 @@ echo "$initial_count" | while read -r line; do
8685
echo $fail_test
8786
if [ "$fail_test" = false ]; then
8887
log_pass "$TESTNAME : Test Passed"
89-
echo "$TESTNAME PASS" > "$res_file"
88+
log_pass_and_emit "$TESTNAME"
9089
exit 0
9190
else
9291
log_fail "$TESTNAME : Test Failed"
93-
echo "$TESTNAME FAIL" > "$res_file"
92+
log_fail_and_emit "$TESTNAME"
9493
exit 1
9594
fi
9695
done

0 commit comments

Comments
 (0)