summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/compositor/tst_compositor.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-31 14:34:01 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-31 14:42:48 +0100
commit1a52c4db428e65f4a0b92bea5811014aaa387263 (patch)
tree5a8c0d02c08cd32db10b3923496fa0010336a123 /tests/auto/compositor/compositor/tst_compositor.cpp
parent5832b6628d848b271efae99585206fa02fc214c9 (diff)
parent8d1fedd6781babaf130486e5c7192b0ebc9fb039 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts: src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp Change-Id: I42733f5ad9429a5d2ff6c804eb1f3f2d50f50811
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 64fb29b8..1397414a 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -121,10 +121,15 @@ private slots:
void idleInhibit();
void xdgOutput();
+
+private:
+ QTemporaryDir m_tmpRuntimeDir;
};
void tst_WaylandCompositor::init() {
- qputenv("XDG_RUNTIME_DIR", ".");
+ // We need to set a test specific runtime dir so we don't conflict with other tests'
+ // compositors by accident.
+ qputenv("XDG_RUNTIME_DIR", m_tmpRuntimeDir.path().toLocal8Bit());
}
void tst_WaylandCompositor::singleClient()