whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip QVulkan autotests on Android 

This is for the emulator, but have no means to differentiate more
precisely now.

The individual skips are unified in a single place.

Fixes: QTBUG-118234
Change-Id: I5676d11a565b88401d03bf51a10e03d53223df04
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
bb10
Laszlo Agocs 2023-10-25 19:10:26 +02:00
parent 7a3261c196
commit c6138bf9de
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ class tst_QVulkan : public QObject
Q_OBJECT
private slots:
void initTestCase();
void vulkanInstance();
void vulkanCheckSupported();
void vulkanPlainWindow();
@ -25,12 +26,15 @@ private slots:
void vulkanWindowGrab();
};
void tst_QVulkan::vulkanInstance()
void tst_QVulkan::initTestCase()
{
#ifdef Q_OS_ANDROID
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
QSKIP("Fails on Android 12 (QTBUG-111236)");
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()
{
QVulkanInstance inst;
if (!inst.create())
QSKIP("Vulkan init failed; skip");
@ -67,10 +71,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;
@ -96,10 +96,6 @@ 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))
@ -174,10 +170,6 @@ 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");
@ -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");
@ -473,10 +457,6 @@ 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())