@@ -71,19 +71,27 @@ function run_local_tests() (
71
71
rm -f results.*
72
72
73
73
local mantle_container=" $( cat " sdk_container/.repo/manifests/mantle-container" ) "
74
- local custom_test_list=false
74
+ local tests=" "
75
+ local update_tests=false
75
76
76
77
# Generate list of all tests for qemu w/o the devcontainer tests.
77
78
# This will generate globs for top-level test modules, e.g. "cl.update.oem" will become cl.*.
78
79
# Globs are necessary because tests ignore OS min/max version specification if a test was specified with its full name.
79
80
# Using globs will prevent tests to be run which aren't meant for the OS version we're testing.
81
+ # NOTE that update tests get special handling because qemu_update is a separate "platform".
80
82
if [[ $# -eq 0 ]] ; then
81
83
tests=" $( docker run " ${mantle_container} " \
82
84
kola list --platform qemu \
83
85
| awk ' !/^(devcontainer|Test)/ {if ($1 != "") print gensub(/^([^.]+).*/,"\\1",1,$1) ".*"}' | uniq) "
84
- set -- ${tests}
86
+ update_tests=true
85
87
else
86
- custom_test_list=true
88
+ tests=" ${@ } "
89
+ if [[ " $tests " = * " qemu_update" * ]] ; then
90
+ update_tests=true
91
+ fi
92
+ if [[ " $tests " = " qemu_update" ]] ; then
93
+ tests=" "
94
+ fi
87
95
fi
88
96
89
97
source ci-automation/test.sh || exit 1
@@ -93,8 +101,15 @@ function run_local_tests() (
93
101
echo " Using Mantle docker image '${mantle_container} '"
94
102
95
103
rm -f results.sqlite
96
- test_run " ${arch} " qemu_uefi " ${@ } "
97
- if [[ " ${custom_test_list} " = " false" ]] ; then
104
+ if [[ -n " ${tests} " ]] ; then
105
+ echo " ================================="
106
+ echo " Running qemu_uefi tests"
107
+ test_run " ${arch} " qemu_uefi " ${tests} "
108
+ fi
109
+
110
+ if ${update_tests} ; then
111
+ echo " ================================="
112
+ echo " Running qemu_update tests"
98
113
test_run " ${arch} " qemu_update
99
114
fi
100
115
0 commit comments