Skip to content

Commit cefead0

Browse files
authored
Merge branch 'qualcomm-linux:main' into fscryptctl-branch
2 parents 8cd8ca0 + 8e078f4 commit cefead0

File tree

9 files changed

+56
-404
lines changed

9 files changed

+56
-404
lines changed

.github/workflows/check-executable-permissions.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
name: Enforce Script Executable Permissions
22

33
on:
4-
pull_request:
4+
pull_request_target:
5+
branches: [ "main" ]
56
paths:
67
- '**/run.sh'
78
- '**/*.sh'
9+
push:
10+
branches: [ "main" ]
11+
workflow_dispatch:
812

913
jobs:
1014
permissions:

.github/workflows/preflight-checker-workflow.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ on:
66
branches: [ "main" ]
77
workflow_dispatch:
88

9+
permissions:
10+
contents: read
11+
security-events: write
12+
913
jobs:
1014
checker:
1115
uses: qualcomm-linux/qli-actions/.github/workflows/multi-checker.yml@main
1216
with:
1317
repolinter: true # default: true
14-
semgrep: false # default: true
18+
semgrep: true # default: true
1519
copyright-license-detector: true # default: true
1620
pr-check-emails: true # default: true
1721

.github/workflows/shellcheck.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Shell Lint
22

3-
on: [pull_request, push]
3+
on:
4+
pull_request_target:
5+
branches: [ "main" ]
6+
push:
7+
branches: [ "main" ]
8+
workflow_dispatch:
49

510
jobs:
611
shellcheck:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,8 @@ run:
5252
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/storage/storage.res || true
5353
- $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh || true
5454
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/wpss_remoteproc.res || true
55+
- $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
57+
- $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
5559
- $PWD/utils/result_parse.sh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ log_info "-------- Starting $TESTNAME Functional Test --------"
3939

4040
check_dependencies taskset top chrt zcat grep
4141

42-
REQUIRED_CONFIGS="CONFIG_SCHED_DEBUG CONFIG_CGROUP_SCHED CONFIG_SMP"
42+
REQUIRED_CONFIGS="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"

Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,13 @@ log_info "rngtest: FIPS 140-2 successes = $successes"
8383
if [ "$successes" -ge 10 ]; then
8484
log_pass "$TESTNAME : Test Passed ($successes FIPS 140-2 successes)"
8585
echo "$TESTNAME PASS" > "$res_file"
86+
rm -f "$TMP_BIN" "$TMP_OUT"
87+
exit 0
8688
else
8789
log_fail "$TESTNAME : Test Failed ($successes FIPS 140-2 successes)"
8890
echo "$TESTNAME FAIL" > "$res_file"
91+
rm -f "$TMP_BIN" "$TMP_OUT"
92+
exit 1
8993
fi
9094

91-
rm -f "$TMP_BIN" "$TMP_OUT"
92-
9395
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

Runner/suites/Multimedia/Graphics/KMSCube/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
# shellcheck disable=SC1090,SC1091
2828
. "$TOOLS/functestlib.sh"
2929

30-
TESTNAME="kmscube"
30+
TESTNAME="KMSCube"
3131
FRAME_COUNT=999
3232
EXPECTED_FRAMES=$((FRAME_COUNT - 1))
3333
test_path=$(find_test_case_by_name "$TESTNAME")

Runner/utils/LICENSE

Lines changed: 0 additions & 354 deletions
This file was deleted.

Runner/utils/send-to-lava.sh

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,39 @@
11
#!/bin/sh
22

3-
RESULT_FILE="$1"
3+
#Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
#SPDX-License-Identifier: BSD-3-Clause-Clear
45

5-
command -v lava-test-case > /dev/null 2>&1
6-
lava_test_case="$?"
7-
command -v lava-test-set > /dev/null 2>&1
8-
lava_test_set="$?"
6+
RESULT_FILE="$1"
7+
SIGNAL_FILE="/tmp/lava_signals_$$.log"
98

10-
if [ -f "${RESULT_FILE}" ]; then
11-
while read -r line; do
12-
if echo "${line}" | grep -iq -E ".* +(pass|fail|skip|unknown)$"; then
13-
test="${line%% *}"
14-
result="${line##* }"
9+
valid_result() {
10+
case "$1" in
11+
PASS|FAIL|SKIP|UNKNOWN) return 0 ;;
12+
*) return 1 ;;
13+
esac
14+
}
1515

16-
if [ "${lava_test_case}" -eq 0 ]; then
17-
lava-test-case "${test}" --result "${result}"
18-
else
19-
echo "<TEST_CASE_ID=${test} RESULT=${result}>"
20-
fi
21-
elif echo "${line}" | grep -iq -E ".*+ (pass|fail|skip|unknown)+ .*+"; then
22-
test="$(echo "${line}" | awk '{print $1}')"
23-
result="$(echo "${line}" | awk '{print $2}')"
24-
measurement="$(echo "${line}" | awk '{print $3}')"
25-
units="$(echo "${line}" | awk '{print $4}')"
16+
# Collect signals in buffer
17+
if [ -f "$RESULT_FILE" ]; then
18+
while IFS= read -r line || [ -n "$line" ]; do
19+
testcase=$(echo "$line" | awk '{print $1}')
20+
result=$(echo "$line" | awk '{print $NF}' | tr '[:lower:]' '[:upper:]')
21+
testcase_clean=$(echo "$testcase" | tr -dc '[:alnum:]_-')
2622

27-
if [ "${lava_test_case}" -eq 0 ]; then
28-
if [ -n "${units}" ]; then
29-
lava-test-case "${test}" --result "${result}" --measurement "${measurement}" --units "${units}"
30-
else
31-
lava-test-case "${test}" --result "${result}" --measurement "${measurement}"
32-
fi
33-
else
34-
echo "<TEST_CASE_ID=${test} RESULT=${result} MEASUREMENT=${measurement} UNITS=${units}>"
35-
fi
36-
elif echo "${line}" | grep -iq -E "^lava-test-set.*"; then
37-
test_set_status="$(echo "${line}" | awk '{print $2}')"
38-
test_set_name="$(echo "${line}" | awk '{print $3}')"
39-
if [ "${lava_test_set}" -eq 0 ]; then
40-
lava-test-set "${test_set_status}" "${test_set_name}"
41-
else
42-
if [ "${test_set_status}" = "start" ]; then
43-
echo "<LAVA_SIGNAL_TESTSET START ${test_set_name}>"
44-
else
45-
echo "<LAVA_SIGNAL_TESTSET STOP>"
46-
fi
47-
fi
23+
if valid_result "$result"; then
24+
printf '<<<LAVA_SIGNAL_TESTCASE TEST_CASE_ID=%s RESULT=%s>>>\n' \
25+
"$testcase_clean" "$result" >> "$SIGNAL_FILE"
4826
fi
49-
done < "${RESULT_FILE}"
27+
done < "$RESULT_FILE"
5028
else
51-
echo "WARNING: result file is missing!"
29+
echo "[WARNING] Result file missing: $RESULT_FILE" >&2
5230
fi
31+
32+
# Emit signals in one clean atomic flush
33+
if [ -s "$SIGNAL_FILE" ]; then
34+
sleep 1 # small delay to let dmesg calm
35+
cat "$SIGNAL_FILE"
36+
fi
37+
38+
# Cleanup
39+
rm -f "$SIGNAL_FILE"

0 commit comments

Comments
 (0)