From fd15b2178a3468bf1fcd04b79467e1400ec6c8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= <konsta.alajarvi@qt.io>
Date: Fri, 17 Jan 2025 08:16:50 +0200
Subject: [PATCH] Unblacklist tst_qrhi
 renderToTextureSampleWithSeparateTextureAndSampler

Unblacklist test function by skipping it with Android with Vulkan.

Fixes: QTQAINFRA-6335
Pick-to: 6.8
Change-Id: I2ee093542f09f68044baa044b697a09af066fcd8
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Lauri Pohjanheimo <lauri.pohjanheimo@qt.io>
(cherry picked from commit 83a4128ecbc260231b942f811b34fbe7595b14bc)
---
 tests/auto/gui/rhi/qrhi/BLACKLIST    | 2 --
 tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST
index b3284f89795..018c0fa968d 100644
--- a/tests/auto/gui/rhi/qrhi/BLACKLIST
+++ b/tests/auto/gui/rhi/qrhi/BLACKLIST
@@ -11,8 +11,6 @@ android
 [renderToTextureTextureArray]
 android
 # Ditto
-[renderToTextureSampleWithSeparateTextureAndSampler]
-android
 [renderToFloatTexture]
 android
 [renderToRgb10Texture]
diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
index 88b561c6428..bd9618c369a 100644
--- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
+++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
@@ -2324,6 +2324,12 @@ void tst_QRhi::renderToTextureSampleWithSeparateTextureAndSampler()
     QFETCH(QRhi::Implementation, impl);
     QFETCH(QRhiInitParams *, initParams);
 
+#ifdef Q_OS_ANDROID
+    if (impl == QRhi::Vulkan) {
+        QSKIP("This function fails with Vulkan on Android, see QTQAINFRA-6926 for more info.");
+    }
+#endif
+
     QScopedPointer<QRhi> rhi(QRhi::create(impl, initParams, QRhi::Flags(), nullptr));
     if (!rhi)
         QSKIP("QRhi could not be created, skipping testing rendering");