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

Wayland tests: use initTestCase() instead of init() to set env

Browse Source 
Once is fine. We don't need to set the environment before each test
function.

Change-Id: Id27938950c196d6d3397fffd2fbf1a66fe7504f9
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: David Redondo <qt@david-redondo.de>
(cherry picked from commit 4e57583f33fed081442526dff6473ce00c85e0be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2025-06-03 17:12:30 -03:00 committed by Qt Cherry-pick Bot
parent fcd76f6d24
commit a1c1dda418
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/wayland/cursor/tst_cursor.cpp
View File

@ -18,7 +18,7 @@ public:
tst_cursor(); tst_cursor();
CursorShapeDevice* cursorShape(); CursorShapeDevice* cursorShape();
private slots: private slots:
void init(); void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void setCursor(); void setCursor();
void overrideCursor(); void overrideCursor();
@ -40,7 +40,7 @@ CursorShapeDevice* tst_cursor::cursorShape()
return manager->m_cursorDevices[0]; return manager->m_cursorDevices[0];
} }
void tst_cursor::init() void tst_cursor::initTestCase()
{ {
setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1);
} }

4
tests/auto/wayland/scaling/tst_scaling.cpp
View File

@ -13,7 +13,7 @@ class tst_scaling : public QObject, private DefaultCompositor
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
void init(); void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void scaledWindow(); void scaledWindow();
void roundingPolicy_data(); void roundingPolicy_data();
@ -21,7 +21,7 @@ private slots:
}; };
void tst_scaling::init() void tst_scaling::initTestCase()
{ {
setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1);
} }

4
tests/auto/wayland/xdgshell/tst_xdgshell.cpp
View File

@ -14,7 +14,7 @@ class tst_xdgshell : public QObject, private DefaultCompositor
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
void init(); void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void showMinimized(); void showMinimized();
void basicConfigure(); void basicConfigure();
@ -40,7 +40,7 @@ private slots:
void modalityWithoutTransientParent(); void modalityWithoutTransientParent();
}; };
void tst_xdgshell::init() void tst_xdgshell::initTestCase()
{ {
setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1);
} }