Skip to content

Commit 73a2a03

Browse files
mwasilewmwasilew
committed
Merge branch 'vnarapar-LAVA'
Merge PR qualcomm-linux#30 Signed-off-by: Milosz Wasilewski <[email protected]>
2 parents 9bb4e8a + d9e8de8 commit 73a2a03

File tree

38 files changed

+1041
-556
lines changed

38 files changed

+1041
-556
lines changed

‎Runner/init_env‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
# SPDX-License-Identifier: BSD-3-Clause-Clear
33

44
# Source this file to setup the test suite environment
5-
if [ -e '/var/Runner' ];then
6-
export BASEDIR='/var/Runner'
7-
export TOOLS='/var/Runner/utils'
8-
export SUITES='/var/Runner/suites'
9-
export CALIBRATION='/var/Runner/calib.txt'
10-
export FTRACE_EVENTS='/var/Runner/ftrace_events'
11-
export PATH=$PATH:'/bin'
12-
export PATH=$PATH:'/sbin'
13-
fi
14-
5+
export BASEDIR=$(pwd)
6+
export TOOLS=$(pwd)/utils
7+
export SUITES=$(pwd)/suites

‎Runner/plans/KernelCI_PreMerge.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
metadata:
2+
format: Lava-Test Test Definition 1.0
3+
name: AUSanity
4+
description: "Baseline AU Sanity test plan"
5+
maintainer:
6+
- [email protected]
7+
os:
8+
- openembedded
9+
scope:
10+
- functional
11+
devices:
12+
- rb3gen2
13+
14+
run:
15+
steps:
16+
- cd Runner
17+
- $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
19+
- $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
21+
- $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
23+
- $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
25+
- $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
27+
- $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
29+
- $PWD/suites/Kernel/FunctionalArea/baseport/iommu/run.sh || true
30+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/iommu/iommu.res || true
31+
- $PWD/suites/Kernel/FunctionalArea/baseport/IPA/run.sh || true
32+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/IPA/IPA.res || true
33+
- $PWD/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh || true
34+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/IPCC/IPCC.res || true
35+
- $PWD/suites/Kernel/FunctionalArea/baseport/irq/run.sh || true
36+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/irq/irq.res || true
37+
- $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh || true
38+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/kaslr.res || true
39+
- $PWD/suites/Kernel/FunctionalArea/baseport/MEMLAT/run.sh || true
40+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/pinctrl/pinctrl.res || true
41+
- $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh || true
42+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/Reboot_health_check.res || true
43+
- $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh || true
44+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/remoteproc.res || true
45+
- $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh || true
46+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/RMNET.res || true
47+
- $PWD/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh || true
48+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/smmu/smmu.res || true
49+
- $PWD/suites/Kernel/FunctionalArea/baseport/storage/run.sh || true
50+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/storage/storage.res || true
51+
- $PWD/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh || true
52+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/watchdog/watchdog.res || true
53+
- $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

‎Runner/plans/meta-qcom_PreMerge.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
metadata:
2+
format: Lava-Test Test Definition 1.0
3+
name: AUSanity
4+
description: "Baseline AU Sanity test plan"
5+
maintainer:
6+
- [email protected]
7+
os:
8+
- openembedded
9+
scope:
10+
- functional
11+
devices:
12+
- rb3gen2
13+
14+
run:
15+
steps:
16+
- cd Runner
17+
- $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
19+
- $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
21+
- $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
23+
- $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
25+
- $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
27+
- $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
29+
- $PWD/suites/Kernel/FunctionalArea/baseport/iommu/run.sh || true
30+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/iommu/iommu.res || true
31+
- $PWD/suites/Kernel/FunctionalArea/baseport/IPA/run.sh || true
32+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/IPA/IPA.res || true
33+
- $PWD/suites/Kernel/FunctionalArea/baseport/IPCC/run.sh || true
34+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/IPCC/IPCC.res || true
35+
- $PWD/suites/Kernel/FunctionalArea/baseport/irq/run.sh || true
36+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/irq/irq.res || true
37+
- $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/run.sh || true
38+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/kaslr/kaslr.res || true
39+
- $PWD/suites/Kernel/FunctionalArea/baseport/pinctrl/run.sh || true
40+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/pinctrl/pinctrl.res || true
41+
- $PWD/suites/Kernel/FunctionalArea/baseport/qcrypto/run.sh || true
42+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/qcrypto/qcrypto.res || true
43+
- $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/run.sh || true
44+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Reboot_health_check/Reboot_health_check.res || true
45+
- $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/run.sh || true
46+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/remoteproc/remoteproc.res || true
47+
- $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/run.sh || true
48+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/RMNET/RMNET.res || true
49+
- $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
51+
- $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
53+
- $PWD/suites/Kernel/FunctionalArea/baseport/Timer/run.sh || true
54+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/Timer/Timer.res || true
55+
- $PWD/suites/Kernel/FunctionalArea/baseport/watchdog/run.sh || true
56+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/watchdog/watchdog.res || true
57+
- $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/run.sh || true
58+
- $PWD/utils/send-to-lava.sh $PWD/suites/Kernel/FunctionalArea/baseport/wpss_remoteproc/wpss_remoteproc.res || true

‎Runner/run-test.sh‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,35 @@
33

44
#!/bin/sh
55
# Import test suite definitions
6-
source /var/Runner/init_env
6+
. $(pwd)/init_env
77

88
#import test functions library
9-
source $TOOLS/functestlib.sh
9+
. $TOOLS/functestlib.sh
1010

1111

1212
# Find test case path by name
1313
find_test_case_by_name() {
14-
local test_name="$1"
15-
find /var/Runner/suites -type d -iname "$test_name" 2>/dev/null
14+
# Check if the file is a directory
15+
if [ -d "$1" ]; then
16+
# Get the directory name
17+
dir_name_in_dir=${1##*/}
18+
19+
# Check if the directory name matches the user input (ignoring case)
20+
if [ "${dir_name_in_dir,,}" = "$test_name" ]; then
21+
# Get the absolute path of the directory
22+
abs_path=$(readlink -f "$1")
23+
echo "$abs_path"
24+
fi
25+
fi
26+
27+
# Recursively search for the directory in the subdirectory
28+
for file in "$1"/*; do
29+
# Check if the file is a directory
30+
if [ -d "$file" ]; then
31+
# Recursively search for the directory in the subdirectory
32+
find_test_case_by_name "$file"
33+
fi
34+
done
1635
}
1736

1837
# Execute a test case
@@ -23,11 +42,6 @@ execute_test_case() {
2342
if [ -f "$run_script" ]; then
2443
log "Executing test case: $test_path"
2544
sh "$run_script" 2>&1
26-
# if [ $? -eq 0 ]; then
27-
# log "Test case $test_path passed."
28-
# else
29-
# log "Test case $test_path failed."
30-
# fi
3145
else
3246
log "No run.sh found in $test_path"
3347
fi
@@ -38,8 +52,9 @@ execute_test_case() {
3852

3953
# Function to run a specific test case by name
4054
run_specific_test_by_name() {
41-
local test_name="$1"
42-
test_path=$(find_test_case_by_name "$test_name")
55+
test_name="$1"
56+
test_name=${test_name,,}
57+
test_path=$(find_test_case_by_name ".")
4358
if [ -z "$test_path" ]; then
4459
log "Test case with name $test_name not found."
4560
else
@@ -54,4 +69,4 @@ if [ "$#" -eq 0 ]; then
5469
fi
5570

5671

57-
run_specific_test_by_name "$1"
72+
run_specific_test_by_name "$1"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#!/bin/sh
55
# Import test suite definitions
6-
/var/Runner/init_env
6+
. $(pwd)/init_env
77
TESTNAME="BWMON"
88

99
#import test functions library
10-
source $TOOLS/functestlib.sh
10+
. $TOOLS/functestlib.sh
1111
test_path=$(find_test_case_by_name "$TESTNAME")
1212
log_info "--------------------------------------------------------------------------"
1313
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -54,9 +54,9 @@ done
5454

5555
if $incremented; then
5656
log_pass "$TESTNAME : Test Passed"
57-
echo "$TESTNAME : Test Passed" > $test_path/$TESTNAME.res
57+
echo "$TESTNAME PASS" > $test_path/$TESTNAME.res
5858
else
59-
log_fail "$TESTNAME : Test Failed"
60-
echo "$TESTNAME : Test Failed" > $test_path/$TESTNAME.res
59+
log_fail "$TESTNAME : Test Failed"
60+
echo "$TESTNAME FAIL" > $test_path/$TESTNAME.res
6161
fi
6262
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#!/bin/sh
55
# Import test suite definitions
6-
/var/Runner/init_env
6+
. $(pwd)/init_env
77
TESTNAME="Buses"
88

99
#import test functions library
10-
source $TOOLS/functestlib.sh
10+
. $TOOLS/functestlib.sh
1111
test_path=$(find_test_case_by_name "$TESTNAME")
1212
log_info "-----------------------------------------------------------------------------------------"
1313
log_info "-------------------Starting $TESTNAME Testcase----------------------------"
@@ -21,9 +21,9 @@ output=$(i2c-msm-test -v -D /dev/i2c-0 -l | grep "ret:1")
2121

2222
if echo "$output" | grep -q "Reading"; then
2323
log_pass "$TESTNAME : Test Passed"
24-
echo "$TESTNAME : Test Passed" > $test_path/$TESTNAME.res
24+
echo "$TESTNAME PASS" > $test_path/$TESTNAME.res
2525
else
26-
log_fail "$TESTNAME : Test Failed"
27-
echo "$TESTNAME : Test Failed" > $test_path/$TESTNAME.res
26+
log_fail "$TESTNAME : Test Failed"
27+
echo "$TESTNAME FAIL" > $test_path/$TESTNAME.res
2828
fi
2929
log_info "-------------------Completed $TESTNAME Testcase----------------------------"

0 commit comments

Comments
 (0)