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>

26 files changed, 69 insertions, 57 deletions

diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro
index eaf6c6e95..916b3abe4 100644
--- a/tests/auto/client/client.pro
+++ b/tests/auto/client/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/client/client/client.pro b/tests/auto/client/client/client.pro
new file mode 100644
index 000000000..006d130a0
--- /dev/null
+++ b/tests/auto/client/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/client/mockcompositor.cpp b/tests/auto/client/client/mockcompositor.cpp
index 83dd52ba2..83dd52ba2 100644
--- a/tests/auto/client/mockcompositor.cpp
+++ b/tests/auto/client/client/mockcompositor.cpp
diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/client/mockcompositor.h
index 2f0df4a0f..2f0df4a0f 100644
--- a/tests/auto/client/mockcompositor.h
+++ b/tests/auto/client/client/mockcompositor.h
diff --git a/tests/auto/client/mockinput.cpp b/tests/auto/client/client/mockinput.cpp
index 05df8604b..05df8604b 100644
--- a/tests/auto/client/mockinput.cpp
+++ b/tests/auto/client/client/mockinput.cpp
diff --git a/tests/auto/client/mockinput.h b/tests/auto/client/client/mockinput.h
index d98328a66..d98328a66 100644
--- a/tests/auto/client/mockinput.h
+++ b/tests/auto/client/client/mockinput.h
diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp
index 573de90b9..573de90b9 100644
--- a/tests/auto/client/mockoutput.cpp
+++ b/tests/auto/client/client/mockoutput.cpp
diff --git a/tests/auto/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp
index dfc39e5e4..dfc39e5e4 100644
--- a/tests/auto/client/mockshell.cpp
+++ b/tests/auto/client/client/mockshell.cpp
diff --git a/tests/auto/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp
index b6d338b29..b6d338b29 100644
--- a/tests/auto/client/mocksurface.cpp
+++ b/tests/auto/client/client/mocksurface.cpp
diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/client/mocksurface.h
index 821d49f54..821d49f54 100644
--- a/tests/auto/client/mocksurface.h
+++ b/tests/auto/client/client/mocksurface.h
diff --git a/tests/auto/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 5a1143220..5a1143220 100644
--- a/tests/auto/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro
index 035beeb41..6bf2aef6c 100644
--- a/tests/auto/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor.pro
@@ -1,34 +1,3 @@
-CONFIG += testcase link_pkgconfig
-TARGET = tst_compositor
+TEMPLATE=subdirs
 
-QT += testlib
-QT += core-private gui-private compositor compositor-private
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-server
-} else {
-    LIBS += -lwayland-client -lwayland-server
-}
-
-config_xkbcommon {
-    !contains(QT_CONFIG, no-pkg-config) {
-        PKGCONFIG_PRIVATE += xkbcommon
-    } else {
-        LIBS_PRIVATE += -lxkbcommon
-    }
-} else {
-    DEFINES += QT_NO_WAYLAND_XKB
-}
-
-SOURCES += tst_compositor.cpp \
-           testcompositor.cpp \
-           testkeyboardgrabber.cpp \
-           mockclient.cpp \
-           mockseat.cpp \
-           testinputdevice.cpp
-
-HEADERS += testcompositor.h \
-           testkeyboardgrabber.h \
-           mockclient.h \
-           mockseat.h \
-           testinputdevice.h
+SUBDIRS += compositor
diff --git a/tests/auto/compositor/BLACKLIST b/tests/auto/compositor/compositor/BLACKLIST
index df4672be3..df4672be3 100644
--- a/tests/auto/compositor/BLACKLIST
+++ b/tests/auto/compositor/compositor/BLACKLIST
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
new file mode 100644
index 000000000..39d2179ad
--- /dev/null
+++ b/tests/auto/compositor/compositor/compositor.pro
@@ -0,0 +1,36 @@
+CONFIG += testcase link_pkgconfig
+TARGET = tst_compositor
+
+QT += testlib
+QT += core-private gui-private compositor compositor-private
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-server
+} else {
+    LIBS += -lwayland-client -lwayland-server
+}
+
+config_xkbcommon {
+    !contains(QT_CONFIG, no-pkg-config) {
+        PKGCONFIG_PRIVATE += xkbcommon
+    } else {
+        LIBS_PRIVATE += -lxkbcommon
+    }
+} else {
+    DEFINES += QT_NO_WAYLAND_XKB
+}
+
+SOURCES += \
+    tst_compositor.cpp \
+    testcompositor.cpp \
+    testkeyboardgrabber.cpp \
+    mockclient.cpp \
+    mockseat.cpp \
+    testinputdevice.cpp
+
+HEADERS += \
+    testcompositor.h \
+    testkeyboardgrabber.h \
+    mockclient.h \
+    mockseat.h \
+    testinputdevice.h
diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp
index 33847da7d..33847da7d 100644
--- a/tests/auto/compositor/mockclient.cpp
+++ b/tests/auto/compositor/compositor/mockclient.cpp
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
index 8647205f2..8647205f2 100644
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/compositor/mockclient.h
diff --git a/tests/auto/compositor/mockseat.cpp b/tests/auto/compositor/compositor/mockseat.cpp
index ebf387f94..ebf387f94 100644
--- a/tests/auto/compositor/mockseat.cpp
+++ b/tests/auto/compositor/compositor/mockseat.cpp
diff --git a/tests/auto/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h
index 24399a448..24399a448 100644
--- a/tests/auto/compositor/mockseat.h
+++ b/tests/auto/compositor/compositor/mockseat.h
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
index 95dd87e3c..95dd87e3c 100644
--- a/tests/auto/compositor/testcompositor.cpp
+++ b/tests/auto/compositor/compositor/testcompositor.cpp
diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
index c7d571d23..c7d571d23 100644
--- a/tests/auto/compositor/testcompositor.h
+++ b/tests/auto/compositor/compositor/testcompositor.h
diff --git a/tests/auto/compositor/testinputdevice.cpp b/tests/auto/compositor/compositor/testinputdevice.cpp
index db2d1d706..db2d1d706 100644
--- a/tests/auto/compositor/testinputdevice.cpp
+++ b/tests/auto/compositor/compositor/testinputdevice.cpp
diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/compositor/testinputdevice.h
index df5c646d1..df5c646d1 100644
--- a/tests/auto/compositor/testinputdevice.h
+++ b/tests/auto/compositor/compositor/testinputdevice.h
diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
index da2f467d9..da2f467d9 100644
--- a/tests/auto/compositor/testkeyboardgrabber.cpp
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
index 0ce56b1a7..0ce56b1a7 100644
--- a/tests/auto/compositor/testkeyboardgrabber.h
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index c30ebc02b..c30ebc02b 100644
--- a/tests/auto/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
diff --git a/tests/global/.gitignore b/tests/global/.gitignore
new file mode 100644
index 000000000..7407af1a5
--- /dev/null
+++ b/tests/global/.gitignore
@@ -0,0 +1 @@
+global.pro