ci/android: Move ANDROID_CTS_MODULES to build script
Rely on the include files (-android-cts-include.txt) to filter both tests and modules from Android CTS during test time. Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35706>
This commit is contained in:
committed by
Marge Bot
parent
655cd186ee
commit
545727f97c
@@ -22,6 +22,15 @@ set -x
|
||||
# setting up the environment variables locally
|
||||
ci_tag_build_time_check "ANDROID_CTS_TAG"
|
||||
|
||||
# List of all CTS modules we might want to run in CI
|
||||
# This should be the union of all modules required by our CI jobs
|
||||
# Specific modules to run are selected via the ${GPU_VERSION}-android-cts-include.txt files
|
||||
ANDROID_CTS_MODULES=(
|
||||
"CtsGraphicsTestCases"
|
||||
"CtsNativeHardwareTestCases"
|
||||
"CtsSkQPTestCases"
|
||||
)
|
||||
|
||||
ANDROID_CTS_VERSION="${ANDROID_VERSION}_r1"
|
||||
ANDROID_CTS_DEVICE_ARCH="x86"
|
||||
|
||||
@@ -44,7 +53,7 @@ else
|
||||
|
||||
# Keep only the interesting tests to save space
|
||||
# shellcheck disable=SC2086 # we want word splitting
|
||||
ANDROID_CTS_MODULES_KEEP_EXPRESSION=$(printf "%s|" $ANDROID_CTS_MODULES | sed -e 's/|$//g')
|
||||
ANDROID_CTS_MODULES_KEEP_EXPRESSION=$(printf "%s|" "${ANDROID_CTS_MODULES[@]}" | sed -e 's/|$//g')
|
||||
find /android-cts/testcases/ -mindepth 1 -type d | grep -v -E "$ANDROID_CTS_MODULES_KEEP_EXPRESSION" | xargs rm -rf
|
||||
|
||||
# Using zstd compressed tarball instead of zip, the compression ratio is almost the same, but
|
||||
|
||||
@@ -255,11 +255,6 @@ debian/s390x_build:
|
||||
ANDROID_VERSION: 14
|
||||
ANDROID_NDK_VERSION: "r27c"
|
||||
ANDROID_SDK_VERSION: 34
|
||||
# Space-separated list of interesting CTS modules
|
||||
ANDROID_CTS_MODULES: >-
|
||||
CtsGraphicsTestCases
|
||||
CtsNativeHardwareTestCases
|
||||
CtsSkQPTestCases
|
||||
ANDROID_LLVM_VERSION: llvmorg-19.1.7
|
||||
ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250324
|
||||
# This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
|
||||
|
||||
Reference in New Issue
Block a user