ci/android: show how to add more Android CTS test cases

Show how to add more Android CTS tests cases, using --include-filters

Only CtsNativeHardwareTestCases and CtsSkQPTestCases are actually
enabled for now, because the android-angle-lavapipe-cts job is part of
the pre-merge pipeline and these modules would not be too expensive to
run.

The container size increases by about 60Mb and the test time from 4m to
7 min on a local system, so it's an acceptable compromise to show how
multiple modules can be tested.

A similar mechanism will be used to add CtsDeqpTestCases tests in the
future, probably in nightly or weekly jobs, because that would require
more space in the containers and a lot more time to run the tests.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34479>
This commit is contained in:
Antonio Ospite 2025-04-16 15:54:43 +02:00 committed by Marge Bot
parent fbc715200e
commit 4dabc7776f
4 changed files with 35 additions and 2 deletions

View file

@ -222,7 +222,10 @@ debian/s390x_build:
ANDROID_NDK_VERSION: "r27c"
ANDROID_SDK_VERSION: 34
# Space-separated list of interesting CTS modules
ANDROID_CTS_MODULES: CtsGraphicsTestCases
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

View file

@ -23,7 +23,7 @@ variables:
DEBIAN_BUILD_TAG: "20250324-android"
DEBIAN_TEST_ANDROID_TAG: "20250416-pigtag"
DEBIAN_TEST_ANDROID_TAG: "20250417-aosp-cts"
DEBIAN_TEST_GL_TAG: "20250416-pigtag"
DEBIAN_TEST_VK_TAG: "20250416-pigtag"
KERNEL_ROOTFS_TAG: "20250416-pigtag"

View file

@ -0,0 +1,10 @@
x86_64 CtsGraphicsTestCases
x86_64 CtsNativeHardwareTestCases
x86_64 CtsSkQPTestCases
# When adding more entries like the ones below, uncommented, remember to add
# the respective modules (e.g. CtsDeqpTestCases) to ANDROID_CTS_MODULES in
# .gitlab-ci/container/gitlab-ci.yml::.android-variables
#x86_64 CtsDeqpTestCases dEQP-VK.wsi.android.*
#x86_64 CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.*

View file

@ -27,6 +27,10 @@ x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.AnimatedVectorDrawable
x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.AnimationDrawableTest
x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.IconTest
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuWrite_BLOB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferVertexBuffer_BLOB
# Failures
x86_64 CtsGraphicsTestCases android.graphics.cts.BitmapTest#testHardwareBitmapNotLeaking
x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanRequiredExtensions
@ -38,3 +42,19 @@ x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testAndroidB
x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanVersionForVrHighPerformance
x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanBlockedExtensions
x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkan1_1Requirements
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R10G10B10A2_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R16G16B16A16_FLOAT
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R5G6B5_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8A8_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8A8_UNORM_sRGB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8X8_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8X8_UNORM_sRGB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R5G6B5_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8A8_UNORM
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8A8_UNORM_sRGB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8X8_UNORM
x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_ES2BlendWithNoTexture
x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_GrAHardwareBuffer_BasicDrawTest
x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_VkYCbcrSampler_DrawImageWithYcbcrSampler