From f314e821c11e13151d8e8e02878c29ac4d486606 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 13 Mar 2023 13:18:05 +0200 Subject: Android: skip two qrhi tests to enable Android 12 in CI This is expected to be temporary and to be investigated afterwards. Task-number: QTBUG-108844 Pick-to: 6.5 Change-Id: I0a571dad2b99ceaa0fd48e5cdd81057e49e55ddf Reviewed-by: Ville Voutilainen --- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 5723d3f8c8..844bd6a521 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -5806,6 +5806,10 @@ void tst_QRhi::tessellationInterfaceBlocks_data() void tst_QRhi::tessellationInterfaceBlocks() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Fails on Android 12 (QTBUG-108844)"); +#endif QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); @@ -6361,6 +6365,10 @@ void tst_QRhi::storageBufferRuntimeSizeGraphics_data() void tst_QRhi::storageBufferRuntimeSizeGraphics() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Fails on Android 12 (QTBUG-108844)"); +#endif // Draws a tessellated triangle with color determined by the length of // buffers bound to shader stages. This is primarily to test Metal // SPIRV-Cross buffer size buffers. @@ -6534,6 +6542,10 @@ void tst_QRhi::halfPrecisionAttributes_data() void tst_QRhi::halfPrecisionAttributes() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Fails on Android 12 (QTBUG-108844)"); +#endif QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); -- cgit v1.2.3