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

Vulkan test: replace QVERIFY with appropriate QCOMPARE

Browse Source 
The test has started to be rather flaky, and QCOMPARE provides better
diagnostic messages when failing, printing both the actual and the
expected value.

Pick-to: 6.5
Change-Id: I262e8e85de596ff3502e02ae26a1dd2724af92de
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d736a5e00030058f90a5f83316581e86e434c119)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-09-20 18:13:13 +02:00 committed by Qt Cherry-pick Bot
parent e336111a5d
commit 22a6dd8a66
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,8 @@ void tst_QVulkan::vulkanCheckSupported()
if (inst.create()) { // skip the rest when Vulkan is not supported at all
QVERIFY(!ve.isEmpty());
QVERIFY(ve == inst.supportedExtensions());
QVERIFY(supportedApiVersion.majorVersion() >= 1);
QCOMPARE(ve, inst.supportedExtensions());
QCOMPARE_GE(supportedApiVersion.majorVersion(), 1);
}
}
@ -298,7 +298,7 @@ void tst_QVulkan::vulkanWindow()
QVERIFY(w.graphicsCommandPool() != VK_NULL_HANDLE);
QVERIFY(w.defaultRenderPass() != VK_NULL_HANDLE);
QVERIFY(w.concurrentFrameCount() > 0);
QCOMPARE_GT(w.concurrentFrameCount(), 0);
QVERIFY(w.concurrentFrameCount() <= QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT);
}
@ -439,20 +439,20 @@ void tst_QVulkan::vulkanWindowRenderer()
if (w.availablePhysicalDevices().isEmpty())
QSKIP("No Vulkan physical devices; skip");
QVERIFY(testVulkan.preInitResCount == 1);
QVERIFY(testVulkan.initResCount == 1);
QVERIFY(testVulkan.initSwcResCount == 1);
QCOMPARE(testVulkan.preInitResCount, 1);
QCOMPARE(testVulkan.initResCount, 1);
QCOMPARE(testVulkan.initSwcResCount, 1);
// this has to be QTRY due to the async update in QVulkanWindowPrivate::ensureStarted()
QTRY_VERIFY(testVulkan.startNextFrameCount >= 1);
QVERIFY(!w.swapChainImageSize().isEmpty());
QVERIFY(w.colorFormat() != VK_FORMAT_UNDEFINED);
QVERIFY(w.depthStencilFormat() != VK_FORMAT_UNDEFINED);
QCOMPARE_NE(w.colorFormat(), VK_FORMAT_UNDEFINED);
QCOMPARE_NE(w.depthStencilFormat(), VK_FORMAT_UNDEFINED);
w.destroy();
waitForUnexposed(&w);
QVERIFY(testVulkan.releaseSwcResCount == 1);
QVERIFY(testVulkan.releaseResCount == 1);
QCOMPARE(testVulkan.releaseSwcResCount, 1);
QCOMPARE(testVulkan.releaseResCount, 1);
}
void tst_QVulkan::vulkanWindowGrab()
@ -506,9 +506,9 @@ void tst_QVulkan::vulkanWindowGrab()
int greenFuzz = qAbs(qGreen(a) - qGreen(refPixel));
int blueFuzz = qAbs(qBlue(a) - qBlue(refPixel));
QVERIFY(redFuzz <= 1);
QVERIFY(blueFuzz <= 1);
QVERIFY(greenFuzz <= 1);
QCOMPARE_LE(redFuzz, 1);
QCOMPARE_LE(blueFuzz, 1);
QCOMPARE_LE(greenFuzz, 1);
w.destroy();
}