From 895b46e39407d9e371ece82bc063442082dd4222 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Fri, 5 Aug 2016 11:53:43 +0200
Subject: [PATCH] Fix autotest directory structure

The client and server parts are separate modules, so they need separate
top-level directories under tests/auto. This also makes it easier to add
new tests later.

Change-Id: I393341b6f4e8fc3afa480653f3482192e002e425
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
---
 tests/auto/wayland/client.pro                 | 26 ++---------------
 tests/auto/wayland/client/client.pro          | 28 +++++++++++++++++++
 .../wayland/{ => client}/mockcompositor.cpp   |  0
 .../wayland/{ => client}/mockcompositor.h     |  0
 tests/auto/wayland/{ => client}/mockinput.cpp |  0
 tests/auto/wayland/{ => client}/mockinput.h   |  0
 .../auto/wayland/{ => client}/mockoutput.cpp  |  0
 tests/auto/wayland/{ => client}/mockshell.cpp |  0
 .../auto/wayland/{ => client}/mocksurface.cpp |  0
 tests/auto/wayland/{ => client}/mocksurface.h |  0
 .../auto/wayland/{ => client}/tst_client.cpp  |  0
 11 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 tests/auto/wayland/client/client.pro
 rename tests/auto/wayland/{ => client}/mockcompositor.cpp (100%)
 rename tests/auto/wayland/{ => client}/mockcompositor.h (100%)
 rename tests/auto/wayland/{ => client}/mockinput.cpp (100%)
 rename tests/auto/wayland/{ => client}/mockinput.h (100%)
 rename tests/auto/wayland/{ => client}/mockoutput.cpp (100%)
 rename tests/auto/wayland/{ => client}/mockshell.cpp (100%)
 rename tests/auto/wayland/{ => client}/mocksurface.cpp (100%)
 rename tests/auto/wayland/{ => client}/mocksurface.h (100%)
 rename tests/auto/wayland/{ => client}/tst_client.cpp (100%)

diff --git a/tests/auto/wayland/client.pro b/tests/auto/wayland/client.pro
index eaf6c6e9586..916b3abe445 100644
--- a/tests/auto/wayland/client.pro
+++ b/tests/auto/wayland/client.pro
@@ -1,25 +1,3 @@
-CONFIG += testcase link_pkgconfig
-TARGET = tst_client
+TEMPLATE=subdirs
 
-QT += testlib
-QT += core-private gui-private
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-server
-} else {
-    LIBS += -lwayland-client -lwayland-server
-}
-
-CONFIG += wayland-scanner
-WAYLANDSERVERSOURCES += \
-    ../../../src/3rdparty/protocol/wayland.xml
-
-SOURCES += tst_client.cpp \
-           mockcompositor.cpp \
-           mockinput.cpp \
-           mockshell.cpp \
-           mocksurface.cpp \
-           mockoutput.cpp
-HEADERS += mockcompositor.h \
-           mockinput.h \
-           mocksurface.h \
+SUBDIRS += client
diff --git a/tests/auto/wayland/client/client.pro b/tests/auto/wayland/client/client.pro
new file mode 100644
index 00000000000..006d130a039
--- /dev/null
+++ b/tests/auto/wayland/client/client.pro
@@ -0,0 +1,28 @@
+CONFIG += testcase link_pkgconfig
+TARGET = tst_client
+
+QT += testlib
+QT += core-private gui-private
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-server
+} else {
+    LIBS += -lwayland-client -lwayland-server
+}
+
+CONFIG += wayland-scanner
+WAYLANDSERVERSOURCES += \
+    ../../../../src/3rdparty/protocol/wayland.xml
+
+SOURCES += \
+    tst_client.cpp \
+    mockcompositor.cpp \
+    mockinput.cpp \
+    mockshell.cpp \
+    mocksurface.cpp \
+    mockoutput.cpp
+
+HEADERS += \
+    mockcompositor.h \
+    mockinput.h \
+    mocksurface.h
diff --git a/tests/auto/wayland/mockcompositor.cpp b/tests/auto/wayland/client/mockcompositor.cpp
similarity index 100%
rename from tests/auto/wayland/mockcompositor.cpp
rename to tests/auto/wayland/client/mockcompositor.cpp
diff --git a/tests/auto/wayland/mockcompositor.h b/tests/auto/wayland/client/mockcompositor.h
similarity index 100%
rename from tests/auto/wayland/mockcompositor.h
rename to tests/auto/wayland/client/mockcompositor.h
diff --git a/tests/auto/wayland/mockinput.cpp b/tests/auto/wayland/client/mockinput.cpp
similarity index 100%
rename from tests/auto/wayland/mockinput.cpp
rename to tests/auto/wayland/client/mockinput.cpp
diff --git a/tests/auto/wayland/mockinput.h b/tests/auto/wayland/client/mockinput.h
similarity index 100%
rename from tests/auto/wayland/mockinput.h
rename to tests/auto/wayland/client/mockinput.h
diff --git a/tests/auto/wayland/mockoutput.cpp b/tests/auto/wayland/client/mockoutput.cpp
similarity index 100%
rename from tests/auto/wayland/mockoutput.cpp
rename to tests/auto/wayland/client/mockoutput.cpp
diff --git a/tests/auto/wayland/mockshell.cpp b/tests/auto/wayland/client/mockshell.cpp
similarity index 100%
rename from tests/auto/wayland/mockshell.cpp
rename to tests/auto/wayland/client/mockshell.cpp
diff --git a/tests/auto/wayland/mocksurface.cpp b/tests/auto/wayland/client/mocksurface.cpp
similarity index 100%
rename from tests/auto/wayland/mocksurface.cpp
rename to tests/auto/wayland/client/mocksurface.cpp
diff --git a/tests/auto/wayland/mocksurface.h b/tests/auto/wayland/client/mocksurface.h
similarity index 100%
rename from tests/auto/wayland/mocksurface.h
rename to tests/auto/wayland/client/mocksurface.h
diff --git a/tests/auto/wayland/tst_client.cpp b/tests/auto/wayland/client/tst_client.cpp
similarity index 100%
rename from tests/auto/wayland/tst_client.cpp
rename to tests/auto/wayland/client/tst_client.cpp