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

Revert "Skip QVulkan autotests on Android"

Browse Source 
This reverts commit c6138bf9de411450cbadf9576a256296b5917e01.

Reason for revert: latest emulator version fixed the issue.

Task-number: QTBUG-118234
Task-number: QTQAINFRA-5971
Change-Id: I7137851baf2b71e760af4bfab7726d761b7f59ff
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 4244b4194c34df1b473b279e20b332e97f3e17fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2024-03-26 11:11:55 +00:00 committed by Qt Cherry-pick Bot
parent 63395dda39
commit 21ff70afb4
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ class tst_QVulkan : public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase();
void vulkanInstance(); void vulkanInstance();
void vulkanCheckSupported(); void vulkanCheckSupported();
void vulkanPlainWindow(); void vulkanPlainWindow();
@ -26,15 +25,12 @@ private slots:
void vulkanWindowGrab(); void vulkanWindowGrab();
}; };
void tst_QVulkan::initTestCase()
{
#ifdef Q_OS_ANDROID
QSKIP("Fails on Android emulators in CI. Should not be needed on real devices, but skipping for now. QTBUG-105739, QTBUG-108328, QTBUG-111236, QTBUG-118234");
#endif
}
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");
@ -71,6 +67,10 @@ 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;
@ -96,6 +96,10 @@ void tst_QVulkan::vulkanCheckSupported()
void tst_QVulkan::vulkan11() void tst_QVulkan::vulkan11()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-105739)");
#endif
#if VK_VERSION_1_1 #if VK_VERSION_1_1
QVulkanInstance inst; QVulkanInstance inst;
if (inst.supportedApiVersion() < QVersionNumber(1, 1)) if (inst.supportedApiVersion() < QVersionNumber(1, 1))
@ -170,6 +174,10 @@ void tst_QVulkan::vulkan11()
void tst_QVulkan::vulkanPlainWindow() void tst_QVulkan::vulkanPlainWindow()
{ {
#ifdef Q_OS_ANDROID
QSKIP("Fails on Android 7 emulator (QTBUG-108328)");
#endif
QVulkanInstance inst; QVulkanInstance inst;
if (!inst.create()) if (!inst.create())
QSKIP("Vulkan init failed; skip"); QSKIP("Vulkan init failed; skip");
@ -206,6 +214,10 @@ 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");
@ -252,6 +264,10 @@ 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");
@ -457,6 +473,10 @@ void tst_QVulkan::vulkanWindowRenderer()
void tst_QVulkan::vulkanWindowGrab() void tst_QVulkan::vulkanWindowGrab()
{ {
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-105739)");
#endif
QVulkanInstance inst; QVulkanInstance inst;
inst.setLayers(QByteArrayList() << "VK_LAYER_KHRONOS_validation"); inst.setLayers(QByteArrayList() << "VK_LAYER_KHRONOS_validation");
if (!inst.create()) if (!inst.create())