From 34d856be264669c855da9d7fb0a6077a78fea8f6 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 2 Apr 2024 19:18:26 +0000 Subject: [PATCH] Revert "Android: SKIP cases failing on Android 12 CI with 16GB RAM" This partially reverts commit eb0d7b5dcf834c856d58637ada8745aee2b040ee. Leaving tst_QRhi::tessellation() skipped because it still fails. Reason for revert: The latest emulator fixed the issue. Fixes: QTBUG-111235 Fixes: QTBUG-111236 Task-number: QTQAINFRA-5971 Pick-to: 6.5 Change-Id: I9a624be6ba219a4175c0e84ba68d882953422cba Reviewed-by: Ville Voutilainen Reviewed-by: Rami Potinkara (cherry picked from commit 772fd609c6eff09bdaa44cb2ac5f913e58788fa3) Reviewed-by: Qt CI Bot --- tests/auto/gui/qvulkan/tst_qvulkan.cpp | 16 ---------------- .../widgets/qopenglwidget/tst_qopenglwidget.cpp | 4 ---- 2 files changed, 20 deletions(-) diff --git a/tests/auto/gui/qvulkan/tst_qvulkan.cpp b/tests/auto/gui/qvulkan/tst_qvulkan.cpp index 1e470ccde31..c8f5c27481c 100644 --- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp +++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp @@ -27,10 +27,6 @@ private slots: void tst_QVulkan::vulkanInstance() { -#ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) - QSKIP("Fails on Android 12 (QTBUG-111236)"); -#endif QVulkanInstance inst; if (!inst.create()) QSKIP("Vulkan init failed; skip"); @@ -67,10 +63,6 @@ void tst_QVulkan::vulkanInstance() void tst_QVulkan::vulkanCheckSupported() { -#ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) - QSKIP("Fails on Android 12 (QTBUG-111236)"); -#endif // Test the early calls to supportedLayers/extensions/apiVersion that need // the library and some basics, but do not initialize the instance. QVulkanInstance inst; @@ -214,10 +206,6 @@ void tst_QVulkan::vulkanPlainWindow() void tst_QVulkan::vulkanVersionRequest() { -#ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) - QSKIP("Fails on Android 12 (QTBUG-111236)"); -#endif QVulkanInstance inst; if (!inst.create()) QSKIP("Vulkan init failed; skip"); @@ -264,10 +252,6 @@ static void waitForUnexposed(QWindow *w) void tst_QVulkan::vulkanWindow() { -#ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) - QSKIP("Fails on Android 12 (QTBUG-111236)"); -#endif QVulkanInstance inst; if (!inst.create()) QSKIP("Vulkan init failed; skip"); diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index 5297b9eae4c..773ccd894ca 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -326,10 +326,6 @@ void tst_QOpenGLWidget::reparentToNotYetCreated() void tst_QOpenGLWidget::reparentHidden() { -#ifdef Q_OS_ANDROID - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) - QSKIP("Fails on Android 12 (QTBUG-111235)"); -#endif // Tests QTBUG-60896 QWidget topLevel1;