diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index cfaa37a62d9..109132f98a8 100755 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -79,6 +79,15 @@ gles_cts_patch_files=( build-deqp-gl_Revert-Fix-spurious-failures-when-using-a-config-wit.patch ) +if [ "${DEQP_TARGET}" = 'android' ]; then + gles_cts_patch_files+=( + build-deqp-Print-to-logcat-in-Android-executable-builds.patch + ) + vk_cts_patch_files+=( + build-deqp-Print-to-logcat-in-Android-executable-builds.patch + ) +fi + ### Careful editing anything below this line diff --git a/.gitlab-ci/container/patches/build-deqp-Print-to-logcat-in-Android-executable-builds.patch b/.gitlab-ci/container/patches/build-deqp-Print-to-logcat-in-Android-executable-builds.patch new file mode 100644 index 00000000000..15c73b0f4ab --- /dev/null +++ b/.gitlab-ci/container/patches/build-deqp-Print-to-logcat-in-Android-executable-builds.patch @@ -0,0 +1,64 @@ +From 2826f97e5e78a76a61bf7e18e320feee727fb982 Mon Sep 17 00:00:00 2001 +From: Valentine Burley +Date: Fri, 17 Oct 2025 08:11:11 +0200 +Subject: [PATCH] Print to logcat in Android executable builds. + +Print to both stdout and logcat for debugging. + +Signed-off-by: Valentine Burley +--- + framework/qphelper/qpDebugOut.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c +index 1e88371..dd87f8c 100644 +--- a/framework/qphelper/qpDebugOut.c ++++ b/framework/qphelper/qpDebugOut.c +@@ -98,7 +98,7 @@ void qpDiev(const char *format, va_list args) + } + + /* print() implementation. */ +-#if defined(DEQP_IS_ANDROID_APP) ++#if (DE_OS == DE_OS_ANDROID) + + #include + +@@ -115,6 +115,10 @@ static android_LogPriority getLogPriority(MessageType type) + } + } + ++#endif ++ ++#if defined(DEQP_IS_ANDROID_APP) ++ + void printRaw(MessageType type, const char *message) + { + if (writeRedirect && !writeRedirect(type, message)) +@@ -146,6 +150,10 @@ void printRaw(MessageType type, const char *message) + if (writeRedirect && !writeRedirect(type, message)) + return; + ++#if (DE_OS == DE_OS_ANDROID) ++ __android_log_write(getLogPriority(type), "dEQP", message); ++#endif ++ + FILE *out = getOutFile(type); + + if (type == MESSAGETYPE_ERROR) +@@ -165,6 +173,13 @@ void printFmt(MessageType type, const char *format, va_list args) + if (writeFtmRedirect && !writeFtmRedirect(type, format, args)) + return; + ++#if (DE_OS == DE_OS_ANDROID) ++ va_list args_copy; ++ va_copy(args_copy, args); ++ __android_log_vprint(getLogPriority(type), "dEQP", format, args_copy); ++ va_end(args_copy); ++#endif ++ + FILE *out = getOutFile(type); + + if (type == MESSAGETYPE_ERROR) +-- +2.48.1 + diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7c15b4efb16..62930f0c75f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,7 +23,7 @@ variables: DEBIAN_BUILD_TAG: "20250926-D3D618" DEBIAN_TEST_BASE_TAG: "20250926-gitlab" - DEBIAN_TEST_ANDROID_TAG: "20251014-vkcts" + DEBIAN_TEST_ANDROID_TAG: "20251021-deqp" DEBIAN_TEST_GL_TAG: "20251020-piglit-2a" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20251020-vkd3d"