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

tests: skip most functions in tst_qx11info on offscreen

Browse Source 
Task-number: QTBUG-125446
Change-Id: I6749357df8ac9cd8798fafe2cb5df4f5d40d1633
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 7407161212c56378529427adfe95627677a95cf9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Liang Qi 2024-06-12 11:40:38 +02:00 committed by Qt Cherry-pick Bot
parent dc385b5c0f
commit f9d33433f3
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/auto/gui/platform/qx11info/tst_qx11info.cpp
View File

@ -7,6 +7,8 @@
#include <QtGui/private/qtx11extras_p.h>
using namespace Qt::StringLiterals;
class tst_QX11Info : public QObject
{
Q_OBJECT
@ -83,12 +85,21 @@ void initialize()
}
Q_CONSTRUCTOR_FUNCTION(initialize)
static QString checkSkip() {
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
return "This test is only for X11, not Wayland."_L1;
if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive))
return "This test is only for X11, not offscreen."_L1;
return ""_L1;
}
void tst_QX11Info::startupId()
{
int argc = 0;
QGuiApplication app(argc, 0);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("This test is only for X11, not Wayland.");
QString result = checkSkip();
if (!result.isEmpty())
QSKIP(result.toUtf8());
// This relies on the fact that no widget was shown yet,
// so please make sure this method is always the first test.
@ -110,8 +121,9 @@ void tst_QX11Info::isPlatformX11()
{
int argc = 0;
QGuiApplication app(argc, 0);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("This test is only for X11, not Wayland.");
QString result = checkSkip();
if (!result.isEmpty())
QSKIP(result.toUtf8());
QVERIFY(QX11Info::isPlatformX11());
}
@ -120,8 +132,9 @@ void tst_QX11Info::appTime()
{
int argc = 0;
QGuiApplication app(argc, 0);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("This test is only for X11, not Wayland.");
QString result = checkSkip();
if (!result.isEmpty())
QSKIP(result.toUtf8());
// No X11 event received yet
QCOMPARE(QX11Info::appTime(), 0ul);
@ -348,8 +361,9 @@ void tst_QX11Info::peeker()
{
int argc = 0;
QGuiApplication app(argc, 0);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("This test is only for X11, not Wayland.");
QString result = checkSkip();
if (!result.isEmpty())
QSKIP(result.toUtf8());
PeekerTest test;
test.show();
@ -361,8 +375,9 @@ void tst_QX11Info::isCompositingManagerRunning()
{
int argc = 0;
QGuiApplication app(argc, 0);
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
QSKIP("This test is only for X11, not Wayland.");
QString result = checkSkip();
if (!result.isEmpty())
QSKIP(result.toUtf8());
const bool b = QX11Info::isCompositingManagerRunning();
Q_UNUSED(b);
const bool b2 = QX11Info::isCompositingManagerRunning(0);