diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-03-26 11:11:55 +0000 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-04-05 20:31:06 +0000 |
commit | 4244b4194c34df1b473b279e20b332e97f3e17fe (patch) | |
tree | 7fe7f596be8213cde55f906413d4cb2f23e84f95 /tests/auto/gui/qvulkan/tst_qvulkan.cpp | |
parent | 5eecb143bcdb619a38bf2af52a8a7dae48d9ef61 (diff) |
Revert "Skip QVulkan autotests on Android"
This reverts commit c6138bf9de411450cbadf9576a256296b5917e01.
Reason for revert: latest emulator version fixed the issue.
Task-number: QTBUG-118234
Task-number: QTQAINFRA-5971
Pick-to: 6.7
Change-Id: I7137851baf2b71e760af4bfab7726d761b7f59ff
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'tests/auto/gui/qvulkan/tst_qvulkan.cpp')
-rw-r--r-- | tests/auto/gui/qvulkan/tst_qvulkan.cpp | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/tests/auto/gui/qvulkan/tst_qvulkan.cpp b/tests/auto/gui/qvulkan/tst_qvulkan.cpp index 2ece0c7b00..1e470ccde3 100644 --- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp +++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp @@ -15,7 +15,6 @@ class tst_QVulkan : public QObject Q_OBJECT private slots: - void initTestCase(); void vulkanInstance(); void vulkanCheckSupported(); void vulkanPlainWindow(); @@ -26,15 +25,12 @@ private slots: void vulkanWindowGrab(); }; -void tst_QVulkan::initTestCase() +void tst_QVulkan::vulkanInstance() { #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"); + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Fails on Android 12 (QTBUG-111236)"); #endif -} - -void tst_QVulkan::vulkanInstance() -{ QVulkanInstance inst; if (!inst.create()) QSKIP("Vulkan init failed; skip"); @@ -71,6 +67,10 @@ 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; @@ -96,6 +96,10 @@ void tst_QVulkan::vulkanCheckSupported() 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 QVulkanInstance inst; if (inst.supportedApiVersion() < QVersionNumber(1, 1)) @@ -170,6 +174,10 @@ void tst_QVulkan::vulkan11() void tst_QVulkan::vulkanPlainWindow() { +#ifdef Q_OS_ANDROID + QSKIP("Fails on Android 7 emulator (QTBUG-108328)"); +#endif + QVulkanInstance inst; if (!inst.create()) QSKIP("Vulkan init failed; skip"); @@ -206,6 +214,10 @@ 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"); @@ -252,6 +264,10 @@ 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"); @@ -457,6 +473,10 @@ void tst_QVulkan::vulkanWindowRenderer() void tst_QVulkan::vulkanWindowGrab() { +#ifdef Q_OS_ANDROID + if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31) + QSKIP("Fails on Android 12 (QTBUG-105739)"); +#endif QVulkanInstance inst; inst.setLayers(QByteArrayList() << "VK_LAYER_KHRONOS_validation"); if (!inst.create()) |