summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-14 12:21:41 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-24 09:29:16 +0200
commit781a92bc412f6e908f6de8181037574c17b5b233 (patch)
tree38890cb3d262534bfa9a9c8a3252028bf846087a
parent3d10b7b2de61dbfb64a29f9190962f316f7012f1 (diff)
downloadqtwayland-781a92bc412f6e908f6de8181037574c17b5b233.tar.gz
Client tests: Set WAYLAND_DISPLAY
The tests would previously fail if WAYLAND_DISPLAY was set to something other than empty or wayland-0. For instance when running multiple compositors and trying to run the tests, they would fail because they create a compositor on wayland-0 (using wl_display_add_socket_auto()), but would try to connect to wayland-1 due to the env var. Change-Id: I7771d41737410d5c32f5a6db3de4987096cb4d22 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-rw-r--r--tests/auto/client/shared/corecompositor.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
index 7edb1c2d..5c6c83ba 100644
--- a/tests/auto/client/shared/corecompositor.cpp
+++ b/tests/auto/client/shared/corecompositor.cpp
@@ -43,6 +43,7 @@ CoreCompositor::CoreCompositor()
}
})
{
+ qputenv("WAYLAND_DISPLAY", m_socketName);
m_timer.start();
Q_ASSERT(isClean());
}