From 2cc758045e322873ad58f675a70c8d8366b5c318 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/client/client.pro | 26 ++------------
tests/auto/client/client/client.pro | 28 +++++++++++++++
.../client/{ => client}/mockcompositor.cpp | 0
.../auto/client/{ => client}/mockcompositor.h | 0
tests/auto/client/{ => client}/mockinput.cpp | 0
tests/auto/client/{ => client}/mockinput.h | 0
tests/auto/client/{ => client}/mockoutput.cpp | 0
tests/auto/client/{ => client}/mockshell.cpp | 0
.../auto/client/{ => client}/mocksurface.cpp | 0
tests/auto/client/{ => client}/mocksurface.h | 0
tests/auto/client/{ => client}/tst_client.cpp | 0
tests/auto/compositor/compositor.pro | 35 ++----------------
.../compositor/{ => compositor}/BLACKLIST | 0
.../auto/compositor/compositor/compositor.pro | 36 +++++++++++++++++++
.../{ => compositor}/mockclient.cpp | 0
.../compositor/{ => compositor}/mockclient.h | 0
.../compositor/{ => compositor}/mockseat.cpp | 0
.../compositor/{ => compositor}/mockseat.h | 0
.../{ => compositor}/testcompositor.cpp | 0
.../{ => compositor}/testcompositor.h | 0
.../{ => compositor}/testinputdevice.cpp | 0
.../{ => compositor}/testinputdevice.h | 0
.../{ => compositor}/testkeyboardgrabber.cpp | 0
.../{ => compositor}/testkeyboardgrabber.h | 0
.../{ => compositor}/tst_compositor.cpp | 0
tests/global/.gitignore | 1 +
26 files changed, 69 insertions(+), 57 deletions(-)
create mode 100644 tests/auto/client/client/client.pro
rename tests/auto/client/{ => client}/mockcompositor.cpp (100%)
rename tests/auto/client/{ => client}/mockcompositor.h (100%)
rename tests/auto/client/{ => client}/mockinput.cpp (100%)
rename tests/auto/client/{ => client}/mockinput.h (100%)
rename tests/auto/client/{ => client}/mockoutput.cpp (100%)
rename tests/auto/client/{ => client}/mockshell.cpp (100%)
rename tests/auto/client/{ => client}/mocksurface.cpp (100%)
rename tests/auto/client/{ => client}/mocksurface.h (100%)
rename tests/auto/client/{ => client}/tst_client.cpp (100%)
rename tests/auto/compositor/{ => compositor}/BLACKLIST (100%)
create mode 100644 tests/auto/compositor/compositor/compositor.pro
rename tests/auto/compositor/{ => compositor}/mockclient.cpp (100%)
rename tests/auto/compositor/{ => compositor}/mockclient.h (100%)
rename tests/auto/compositor/{ => compositor}/mockseat.cpp (100%)
rename tests/auto/compositor/{ => compositor}/mockseat.h (100%)
rename tests/auto/compositor/{ => compositor}/testcompositor.cpp (100%)
rename tests/auto/compositor/{ => compositor}/testcompositor.h (100%)
rename tests/auto/compositor/{ => compositor}/testinputdevice.cpp (100%)
rename tests/auto/compositor/{ => compositor}/testinputdevice.h (100%)
rename tests/auto/compositor/{ => compositor}/testkeyboardgrabber.cpp (100%)
rename tests/auto/compositor/{ => compositor}/testkeyboardgrabber.h (100%)
rename tests/auto/compositor/{ => compositor}/tst_compositor.cpp (100%)
create mode 100644 tests/global/.gitignore
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro
index eaf6c6e9..916b3abe 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 00000000..006d130a
--- /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
similarity index 100%
rename from tests/auto/client/mockcompositor.cpp
rename to tests/auto/client/client/mockcompositor.cpp
diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/client/mockcompositor.h
similarity index 100%
rename from tests/auto/client/mockcompositor.h
rename to tests/auto/client/client/mockcompositor.h
diff --git a/tests/auto/client/mockinput.cpp b/tests/auto/client/client/mockinput.cpp
similarity index 100%
rename from tests/auto/client/mockinput.cpp
rename to tests/auto/client/client/mockinput.cpp
diff --git a/tests/auto/client/mockinput.h b/tests/auto/client/client/mockinput.h
similarity index 100%
rename from tests/auto/client/mockinput.h
rename to tests/auto/client/client/mockinput.h
diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp
similarity index 100%
rename from tests/auto/client/mockoutput.cpp
rename to tests/auto/client/client/mockoutput.cpp
diff --git a/tests/auto/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp
similarity index 100%
rename from tests/auto/client/mockshell.cpp
rename to tests/auto/client/client/mockshell.cpp
diff --git a/tests/auto/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp
similarity index 100%
rename from tests/auto/client/mocksurface.cpp
rename to tests/auto/client/client/mocksurface.cpp
diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/client/mocksurface.h
similarity index 100%
rename from tests/auto/client/mocksurface.h
rename to tests/auto/client/client/mocksurface.h
diff --git a/tests/auto/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
similarity index 100%
rename from tests/auto/client/tst_client.cpp
rename to tests/auto/client/client/tst_client.cpp
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro
index 035beeb4..6bf2aef6 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
similarity index 100%
rename from tests/auto/compositor/BLACKLIST
rename to 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 00000000..39d2179a
--- /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
similarity index 100%
rename from tests/auto/compositor/mockclient.cpp
rename to tests/auto/compositor/compositor/mockclient.cpp
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
similarity index 100%
rename from tests/auto/compositor/mockclient.h
rename to tests/auto/compositor/compositor/mockclient.h
diff --git a/tests/auto/compositor/mockseat.cpp b/tests/auto/compositor/compositor/mockseat.cpp
similarity index 100%
rename from tests/auto/compositor/mockseat.cpp
rename to tests/auto/compositor/compositor/mockseat.cpp
diff --git a/tests/auto/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h
similarity index 100%
rename from tests/auto/compositor/mockseat.h
rename to tests/auto/compositor/compositor/mockseat.h
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
similarity index 100%
rename from tests/auto/compositor/testcompositor.cpp
rename to tests/auto/compositor/compositor/testcompositor.cpp
diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
similarity index 100%
rename from tests/auto/compositor/testcompositor.h
rename to tests/auto/compositor/compositor/testcompositor.h
diff --git a/tests/auto/compositor/testinputdevice.cpp b/tests/auto/compositor/compositor/testinputdevice.cpp
similarity index 100%
rename from tests/auto/compositor/testinputdevice.cpp
rename to tests/auto/compositor/compositor/testinputdevice.cpp
diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/compositor/testinputdevice.h
similarity index 100%
rename from tests/auto/compositor/testinputdevice.h
rename to tests/auto/compositor/compositor/testinputdevice.h
diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
similarity index 100%
rename from tests/auto/compositor/testkeyboardgrabber.cpp
rename to tests/auto/compositor/compositor/testkeyboardgrabber.cpp
diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
similarity index 100%
rename from tests/auto/compositor/testkeyboardgrabber.h
rename to tests/auto/compositor/compositor/testkeyboardgrabber.h
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
similarity index 100%
rename from tests/auto/compositor/tst_compositor.cpp
rename to tests/auto/compositor/compositor/tst_compositor.cpp
diff --git a/tests/global/.gitignore b/tests/global/.gitignore
new file mode 100644
index 00000000..7407af1a
--- /dev/null
+++ b/tests/global/.gitignore
@@ -0,0 +1 @@
+global.pro
--
GitLab