diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-31 10:32:18 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-04-03 09:30:49 +0000 |
| commit | 01daa660d04e8960961988da6191e80c05a84d58 (patch) | |
| tree | 46020482e868ebb567dbcc4c52db179b60ae3b80 /tests | |
| parent | d4451028906f91267af6b5439b9798fb337823ca (diff) | |
Set socket name for TestCompositor
Tests did not pass because WAYLAND_DISPLAY only affects clients, not
compositors. Compositor display name can be set either using the command
line argument "--wayland-socket-name" or
QWaylandCompositor::setSocketName. The latter was chosen here.
Change-Id: I524b5c92ec9959486373875850b4f192b62423e0
Reviewed-by: Erik Larsson <erik@ortogonal.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/compositor/testcompositor.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/compositor/tst_compositor.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/testcompositor.cpp index b4b106815..d63e85c7c 100644 --- a/tests/auto/compositor/testcompositor.cpp +++ b/tests/auto/compositor/testcompositor.cpp @@ -35,6 +35,7 @@ TestCompositor::TestCompositor(bool createInputDev) , shell(new QWaylandShell(this)) , m_createInputDevice(createInputDev) { + setSocketName("wayland-qt-test-0"); } void TestCompositor::create() diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp index 422e378dc..0fc855c6e 100644 --- a/tests/auto/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/tst_compositor.cpp @@ -44,7 +44,6 @@ class tst_WaylandCompositor : public QObject public: tst_WaylandCompositor() { setenv("XDG_RUNTIME_DIR", ".", 1); - setenv("WAYLAND_DISPLAY", "wayland-qt-test-0", 1); } private slots: |