Skip to content

Commit f069417

Browse files
vnaraparvnarapar
authored
Merge pull request qualcomm-linux#358 from smuppand/Kernel
shellcheck: remove dead trailing completion logs in kernel run scripts
2 parents 17e8a48 + f58bf98 commit f069417

22 files changed

Lines changed: 92 additions & 108 deletions

File tree

‎Runner/suites/Kernel/Baseport/BWMON/run.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ check_dependencies bw_mem
4343

4444
log_info "Fetching te interconnect summary"
4545
extract_votes() {
46-
cat /sys/kernel/debug/interconnect/interconnect_summary | grep -i pmu | awk '{print $NF}'
46+
grep -i pmu /sys/kernel/debug/interconnect/interconnect_summary | awk '{print $NF}'
4747
}
4848
log_info "Initial vote check:"
4949
sleep 5
@@ -88,4 +88,3 @@ else
8888
echo "$TESTNAME FAIL" > "$res_file"
8989
exit 1
9090
fi
91-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/Baseport/Buses/run.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,3 @@ else
5252
echo "$TESTNAME FAIL" > "$res_file"
5353
exit 1
5454
fi
55-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/Baseport/CPUFreq_Validation/run.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,11 @@ log_info "=== Final Result ==="
108108
if [ "$overall_pass" -eq 0 ]; then
109109
log_pass "$TESTNAME: All policies passed"
110110
echo "$TESTNAME PASS" > "$res_file"
111+
rm -rf "$status_dir"
111112
exit 0
112113
else
113114
log_fail "$TESTNAME: One or more policies failed"
114115
echo "$TESTNAME FAIL" > "$res_file"
116+
rm -rf "$status_dir"
115117
exit 1
116118
fi
117-
118-
rm -rf "$status_dir"
119-
exit "$overall_pass"

‎Runner/suites/Kernel/Baseport/GIC/run.sh‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ log_info "=== Test Initialization ==="
4040

4141
# Function to get the timer count
4242
get_timer_count() {
43-
cat /proc/interrupts | grep arch_timer
43+
grep arch_timer /proc/interrupts
4444
}
4545

4646
# Get the initial timer count
@@ -58,20 +58,20 @@ echo "$final_count"
5858

5959
# Compare the initial and final counts
6060
echo "Comparing timer counts:"
61-
echo "$initial_count" | while read -r line; do
62-
cpu=$(echo "$line" | awk '{print $1}')
63-
initial_values=$(echo "$line" | awk '{for(i=2;i<=9;i++) print $i}')
64-
final_values=$(echo "$final_count" | grep "$cpu" | awk '{for(i=2;i<=9;i++) print $i}')
65-
61+
while IFS= read -r line; do
62+
[ -n "$line" ] || continue
63+
64+
cpu=$(printf '%s\n' "$line" | awk '{print $1}')
65+
initial_values=$(printf '%s\n' "$line" | awk '{for(i=2;i<=9;i++) print $i}')
66+
final_values=$(printf '%s\n' "$final_count" | awk -v cpu="$cpu" '$1 == cpu {for(i=2;i<=9;i++) print $i}')
67+
6668
fail_test=false
67-
initial_values_list=$(echo "$initial_values" | tr ' ' '
68-
')
69-
final_values_list=$(echo "$final_values" | tr ' ' '
70-
')
71-
7269
i=0
73-
echo "$initial_values_list" | while read -r initial_value; do
74-
final_value=$(echo "$final_values_list" | sed -n "$((i+1))p")
70+
71+
while IFS= read -r initial_value; do
72+
[ -n "$initial_value" ] || continue
73+
74+
final_value=$(printf '%s\n' "$final_values" | sed -n "$((i + 1))p")
7575
if [ "$initial_value" -lt "$final_value" ]; then
7676
echo "CPU $i: Timer count has incremented. Test PASSED"
7777
log_pass "CPU $i: Timer count has incremented. Test PASSED"
@@ -80,9 +80,12 @@ echo "$initial_count" | while read -r line; do
8080
log_fail "CPU $i: Timer count has not incremented. Test FAILED"
8181
fail_test=true
8282
fi
83-
i=$((i+1))
84-
done
85-
echo $fail_test
83+
i=$((i + 1))
84+
done <<EOF
85+
$initial_values
86+
EOF
87+
88+
echo "$fail_test"
8689
if [ "$fail_test" = false ]; then
8790
log_pass "$TESTNAME : Test Passed"
8891
echo "$TESTNAME PASS" > "$res_file"
@@ -92,5 +95,6 @@ echo "$initial_count" | while read -r line; do
9295
echo "$TESTNAME FAIL" > "$res_file"
9396
exit 1
9497
fi
95-
done
96-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"
98+
done <<EOF
99+
$initial_count
100+
EOF

‎Runner/suites/Kernel/Baseport/IPCC/run.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ output=$(cat /sys/class/remoteproc/remoteproc*/state)
4242

4343
count=$(echo "$output" | grep -c "running")
4444

45-
if [ $count -eq 4 ]; then
45+
if [ "$count" -eq 4 ]; then
4646
log_pass "$TESTNAME : Test Passed"
4747
log_info "Writing to file $res_file"
4848
echo "$TESTNAME PASS" > "$res_file"
@@ -53,4 +53,3 @@ else
5353
echo "$TESTNAME FAIL" > "$res_file"
5454
exit 1
5555
fi
56-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/Baseport/Interrupts/run.sh‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ log_info "=== Test Initialization ==="
4040

4141
# Function to get the timer count
4242
get_timer_count() {
43-
cat /proc/interrupts | grep arch_timer
43+
grep arch_timer /proc/interrupts
4444
}
4545

4646
# Get the initial timer count
@@ -58,20 +58,20 @@ echo "$final_count"
5858

5959
# Compare the initial and final counts
6060
echo "Comparing timer counts:"
61-
echo "$initial_count" | while read -r line; do
62-
cpu=$(echo "$line" | awk '{print $1}')
63-
initial_values=$(echo "$line" | awk '{for(i=2;i<=9;i++) print $i}')
64-
final_values=$(echo "$final_count" | grep "$cpu" | awk '{for(i=2;i<=9;i++) print $i}')
65-
61+
while IFS= read -r line; do
62+
[ -n "$line" ] || continue
63+
64+
cpu=$(printf '%s\n' "$line" | awk '{print $1}')
65+
initial_values=$(printf '%s\n' "$line" | awk '{for(i=2;i<=9;i++) print $i}')
66+
final_values=$(printf '%s\n' "$final_count" | awk -v cpu="$cpu" '$1 == cpu {for(i=2;i<=9;i++) print $i}')
67+
6668
fail_test=false
67-
initial_values_list=$(echo "$initial_values" | tr ' ' '
68-
')
69-
final_values_list=$(echo "$final_values" | tr ' ' '
70-
')
71-
7269
i=0
73-
echo "$initial_values_list" | while read -r initial_value; do
74-
final_value=$(echo "$final_values_list" | sed -n "$((i+1))p")
70+
71+
while IFS= read -r initial_value; do
72+
[ -n "$initial_value" ] || continue
73+
74+
final_value=$(printf '%s\n' "$final_values" | sed -n "$((i + 1))p")
7575
if [ "$initial_value" -lt "$final_value" ]; then
7676
echo "CPU $i: Timer count has incremented. Test PASSED"
7777
log_pass "CPU $i: Timer count has incremented. Test PASSED"
@@ -80,17 +80,21 @@ echo "$initial_count" | while read -r line; do
8080
log_fail "CPU $i: Timer count has not incremented. Test FAILED"
8181
fail_test=true
8282
fi
83-
i=$((i+1))
84-
done
85-
echo $fail_test
83+
i=$((i + 1))
84+
done <<EOF
85+
$initial_values
86+
EOF
87+
88+
echo "$fail_test"
8689
if [ "$fail_test" = false ]; then
8790
log_pass "$TESTNAME : Test Passed"
88-
echo "$TESTNAME PASS" > "$res_file"
89-
exit 0
91+
echo "$TESTNAME PASS" > "$res_file"
92+
exit 0
9093
else
9194
log_fail "$TESTNAME : Test Failed"
92-
echo "$TESTNAME FAIL" > "$res_file"
93-
exit 1
95+
echo "$TESTNAME FAIL" > "$res_file"
96+
exit 1
9497
fi
95-
done
96-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"
98+
done <<EOF
99+
$initial_count
100+
EOF

‎Runner/suites/Kernel/Baseport/Kernel_Selftests/run.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ while IFS= read -r test || [ -n "$test" ]; do
228228

229229
done < "$whitelist"
230230

231+
log_info "Per-test results written to $per_test_file"
231232
if [ "$fail" -eq 0 ] && [ "$pass" -gt 0 ]; then
232233
echo "$TESTNAME PASS" > "$res_file"
233234
log_pass "$TESTNAME: all tests passed"
@@ -237,6 +238,3 @@ else
237238
log_fail "$TESTNAME: one or more tests failed"
238239
exit 1
239240
fi
240-
241-
log_info "Per-test results written to $per_test_file"
242-
log_info "------------------- Completed $TESTNAME Testcase -----------"

‎Runner/suites/Kernel/Baseport/MEMLAT/run.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ log_info "Checking if dependency binary is available"
4343
check_dependencies lat_mem_rd
4444

4545
extract_votes() {
46-
cat /sys/kernel/debug/interconnect/interconnect_summary | grep -i cpu | awk '{print $NF}'
46+
grep -i cpu /sys/kernel/debug/interconnect/interconnect_summary | awk '{print $NF}'
4747
}
4848

4949
log_info "Initial vote check:"
@@ -90,4 +90,3 @@ else
9090
echo "$TESTNAME FAIL" > "$res_file"
9191
exit 1
9292
fi
93-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/Baseport/PCIe/run.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ else
7474
echo "$TESTNAME FAIL" > "$res_file"
7575
exit 1
7676
fi
77-
78-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

‎Runner/suites/Kernel/Baseport/Timer/run.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,14 @@ else
7979
fi
8080

8181
# --- Check if binary exists in PATH or at custom path ---
82-
check_dependencies "$BINARY"
83-
if [ $? -ne 0 ]; then
82+
if ! check_dependencies "$BINARY"; then
8483
log_skip "$TESTNAME : Binary '$BINARY' not found"
8584
echo "$TESTNAME SKIP" > "$res_file"
8685
exit 0
8786
fi
88-
8987
# Run the binary and capture the output
9088
OUTPUT=$($BINARY)
91-
echo $OUTPUT
89+
echo "$OUTPUT"
9290

9391
# Check if "pass:7" is in the output
9492
if echo "${OUTPUT}" | grep "pass:7"; then
@@ -100,4 +98,3 @@ else
10098
echo "$TESTNAME FAIL" > "$res_file"
10199
exit 1
102100
fi
103-
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

0 commit comments

Comments
 (0)