summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <[email protected]>2025-06-03 17:12:30 -0300
committerThiago Macieira <[email protected]>2025-06-05 17:15:28 -0300
commit4e57583f33fed081442526dff6473ce00c85e0be (patch)
tree323d8bbb9afa180b6bf0cb0f60fbcf319c5e24db
parent687fb924408f2043989b624e658620c59157e15e (diff)
Wayland tests: use initTestCase() instead of init() to set envHEADdev
Once is fine. We don't need to set the environment before each test function. Pick-to: 6.10 Change-Id: Id27938950c196d6d3397fffd2fbf1a66fe7504f9 Reviewed-by: Liang Qi <[email protected]> Reviewed-by: David Redondo <[email protected]>
-rw-r--r--tests/auto/wayland/cursor/tst_cursor.cpp4
-rw-r--r--tests/auto/wayland/scaling/tst_scaling.cpp4
-rw-r--r--tests/auto/wayland/xdgshell/tst_xdgshell.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/wayland/cursor/tst_cursor.cpp b/tests/auto/wayland/cursor/tst_cursor.cpp
index 5bccf09caa1..850592dd8e1 100644
--- a/tests/auto/wayland/cursor/tst_cursor.cpp
+++ b/tests/auto/wayland/cursor/tst_cursor.cpp
@@ -18,7 +18,7 @@ public:
tst_cursor();
CursorShapeDevice* cursorShape();
private slots:
- void init();
+ void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void setCursor();
void overrideCursor();
@@ -40,7 +40,7 @@ CursorShapeDevice* tst_cursor::cursorShape()
return manager->m_cursorDevices[0];
}
-void tst_cursor::init()
+void tst_cursor::initTestCase()
{
qputenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1");
}
diff --git a/tests/auto/wayland/scaling/tst_scaling.cpp b/tests/auto/wayland/scaling/tst_scaling.cpp
index 3ba2c994726..c839b3649b3 100644
--- a/tests/auto/wayland/scaling/tst_scaling.cpp
+++ b/tests/auto/wayland/scaling/tst_scaling.cpp
@@ -13,7 +13,7 @@ class tst_scaling : public QObject, private DefaultCompositor
{
Q_OBJECT
private slots:
- void init();
+ void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void scaledWindow();
void roundingPolicy_data();
@@ -21,7 +21,7 @@ private slots:
};
-void tst_scaling::init()
+void tst_scaling::initTestCase()
{
qputenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1");
}
diff --git a/tests/auto/wayland/xdgshell/tst_xdgshell.cpp b/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
index 5004aa6c038..b144625a3a3 100644
--- a/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
+++ b/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
@@ -14,7 +14,7 @@ class tst_xdgshell : public QObject, private DefaultCompositor
{
Q_OBJECT
private slots:
- void init();
+ void initTestCase();
void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
void showMinimized();
void basicConfigure();
@@ -40,7 +40,7 @@ private slots:
void modalityWithoutTransientParent();
};
-void tst_xdgshell::init()
+void tst_xdgshell::initTestCase()
{
qputenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1");
}