1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Android: SKIP cases failing on Android 12 CI with 16GB RAM"

Browse Source 
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 <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit 772fd609c6eff09bdaa44cb2ac5f913e58788fa3)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2024-04-02 19:18:26 +00:00
parent b131310273
commit 34d856be26
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/gui/qvulkan/tst_qvulkan.cpp
View File

@ -27,10 +27,6 @@ private slots:
void tst_QVulkan::vulkanInstance() void tst_QVulkan::vulkanInstance()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-111236)");
#endif
QVulkanInstance inst; QVulkanInstance inst;
if (!inst.create()) if (!inst.create())
QSKIP("Vulkan init failed; skip"); QSKIP("Vulkan init failed; skip");
@ -67,10 +63,6 @@ void tst_QVulkan::vulkanInstance()
void tst_QVulkan::vulkanCheckSupported() 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 // Test the early calls to supportedLayers/extensions/apiVersion that need
// the library and some basics, but do not initialize the instance. // the library and some basics, but do not initialize the instance.
QVulkanInstance inst; QVulkanInstance inst;
@ -214,10 +206,6 @@ void tst_QVulkan::vulkanPlainWindow()
void tst_QVulkan::vulkanVersionRequest() void tst_QVulkan::vulkanVersionRequest()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-111236)");
#endif
QVulkanInstance inst; QVulkanInstance inst;
if (!inst.create()) if (!inst.create())
QSKIP("Vulkan init failed; skip"); QSKIP("Vulkan init failed; skip");
@ -264,10 +252,6 @@ static void waitForUnexposed(QWindow *w)
void tst_QVulkan::vulkanWindow() void tst_QVulkan::vulkanWindow()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-111236)");
#endif
QVulkanInstance inst; QVulkanInstance inst;
if (!inst.create()) if (!inst.create())
QSKIP("Vulkan init failed; skip"); QSKIP("Vulkan init failed; skip");

4
tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
View File

@ -326,10 +326,6 @@ void tst_QOpenGLWidget::reparentToNotYetCreated()
void tst_QOpenGLWidget::reparentHidden() void tst_QOpenGLWidget::reparentHidden()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-111235)");
#endif
// Tests QTBUG-60896 // Tests QTBUG-60896
QWidget topLevel1; QWidget topLevel1;