1 files changed, 17 insertions, 35 deletions

diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
index 5c6c83baa..d110768ec 100644
--- a/tests/auto/client/shared/corecompositor.cpp
+++ b/tests/auto/client/shared/corecompositor.cpp
@@ -1,38 +1,14 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "corecompositor.h"
+#include <thread>
 
 namespace MockCompositor {
 
-CoreCompositor::CoreCompositor()
-    : m_display(wl_display_create())
-    , m_socketName(wl_display_add_socket_auto(m_display))
+CoreCompositor::CoreCompositor(CompositorType t, int socketFd)
+    : m_type(t)
+    , m_display(wl_display_create())
     , m_eventLoop(wl_display_get_event_loop(m_display))
 
     // Start dispatching
@@ -43,7 +19,12 @@ CoreCompositor::CoreCompositor()
         }
     })
 {
-    qputenv("WAYLAND_DISPLAY", m_socketName);
+    if (socketFd == -1) {
+        QByteArray socketName = wl_display_add_socket_auto(m_display);
+        qputenv("WAYLAND_DISPLAY", socketName);
+    } else {
+        wl_display_add_socket_fd(m_display, socketFd);
+    }
     m_timer.start();
     Q_ASSERT(isClean());
 }
@@ -52,13 +33,15 @@ CoreCompositor::~CoreCompositor()
 {
     m_running = false;
     m_dispatchThread.join();
+    wl_display_destroy_clients(m_display);
     wl_display_destroy(m_display);
+    qDebug() << "cleanup";
 }
 
 bool CoreCompositor::isClean()
 {
     Lock lock(this);
-    for (auto *global : qAsConst(m_globals)) {
+    for (auto *global : std::as_const(m_globals)) {
         if (!global->isClean())
             return false;
     }
@@ -69,18 +52,17 @@ QString CoreCompositor::dirtyMessage()
 {
     Lock lock(this);
     QStringList messages;
-    for (auto *global : qAsConst(m_globals)) {
+    for (auto *global : std::as_const(m_globals)) {
         if (!global->isClean())
             messages << (global->metaObject()->className() % QLatin1String(": ") % global->dirtyMessage());
     }
     return messages.join(", ");
 }
 
-void CoreCompositor::dispatch()
+void CoreCompositor::dispatch(int timeout)
 {
     Lock lock(this);
     wl_display_flush_clients(m_display);
-    constexpr int timeout = 0; // immediate return
     wl_event_loop_dispatch(m_eventLoop, timeout);
 }