14 files changed, 38 insertions, 33 deletions
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