1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify test cmake

Browse Source 
In each test we were recompiling the shared mock compositor. This led to
a lot of difficult to maintain boiler plate as well as slowing down the
build.

This patch turns the shared component into an object library

Change-Id: I2460d3fec312a348fe633ac271f994dd36d564c4
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Edmundson 2021-05-05 06:54:19 +01:00
parent 3e502ff8d9
commit f3fcdc6bfd
14 changed files with 52 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/wayland/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# Generated from client.pro. # Generated from client.pro.
add_subdirectory(shared)
add_subdirectory(client) add_subdirectory(client)
add_subdirectory(datadevicev1) add_subdirectory(datadevicev1)
add_subdirectory(fullscreenshellv1) add_subdirectory(fullscreenshellv1)

23
tests/auto/wayland/datadevicev1/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_datadevicev1 qt_internal_add_test(tst_datadevicev1
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_datadevicev1.cpp tst_datadevicev1.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_datadevicev1
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/inputcontext/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_inputcontext qt_internal_add_test(tst_inputcontext
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_inputcontext.cpp tst_inputcontext.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_inputcontext
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/nooutput/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_nooutput qt_internal_add_test(tst_nooutput
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_nooutput.cpp tst_nooutput.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_nooutput
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/output/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_output qt_internal_add_test(tst_output
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_output.cpp tst_output.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_output
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

24
tests/auto/wayland/primaryselectionv1/CMakeLists.txt
View File

@ -6,29 +6,7 @@
qt_internal_add_test(tst_primaryselectionv1 qt_internal_add_test(tst_primaryselectionv1
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_primaryselectionv1.cpp tst_primaryselectionv1.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_primaryselectionv1
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/seatv4/CMakeLists.txt
View File

@ -6,30 +6,9 @@
qt_internal_add_test(tst_seatv4 qt_internal_add_test(tst_seatv4
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_seatv4.cpp tst_seatv4.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_seatv4
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )
## Scopes: ## Scopes:

23
tests/auto/wayland/seatv5/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_seatv5 qt_internal_add_test(tst_seatv5
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_seatv5.cpp tst_seatv5.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_seatv5
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

38
tests/auto/wayland/shared/CMakeLists.txt Normal file
View File

@ -0,0 +1,38 @@
#####################################################################
##Client test shared components:
#####################################################################
add_library(SharedClientTest
OBJECT
corecompositor.cpp corecompositor.h
coreprotocol.cpp coreprotocol.h
datadevice.cpp datadevice.h
mockcompositor.cpp mockcompositor.h
textinput.cpp textinput.h
xdgoutputv1.cpp xdgoutputv1.h
xdgshell.cpp xdgshell.h
)
set_property(TARGET SharedClientTest PROPERTY AUTOMOC ON)
qt6_generate_wayland_protocol_server_sources(SharedClientTest
FILES
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/tablet-unstable-v2.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/text-input-unstable-v2.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wayland.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-decoration-unstable-v1.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-output-unstable-v1.xml
${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-shell.xml
)
target_link_libraries(SharedClientTest
PUBLIC
Qt::Gui
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
target_include_directories(SharedClientTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

23
tests/auto/wayland/surface/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_surface qt_internal_add_test(tst_surface
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_surface.cpp tst_surface.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_surface
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

24
tests/auto/wayland/tabletv2/CMakeLists.txt
View File

@ -6,29 +6,7 @@
qt_internal_add_test(tst_tabletv2 qt_internal_add_test(tst_tabletv2
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_tabletv2.cpp tst_tabletv2.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_tabletv2
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/tablet-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

24
tests/auto/wayland/xdgdecorationv1/CMakeLists.txt
View File

@ -6,29 +6,7 @@
qt_internal_add_test(tst_xdgdecorationv1 qt_internal_add_test(tst_xdgdecorationv1
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_xdgdecorationv1.cpp tst_xdgdecorationv1.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_xdgdecorationv1
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-decoration-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/xdgoutput/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_xdgoutput qt_internal_add_test(tst_xdgoutput
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_xdgoutput.cpp tst_xdgoutput.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_xdgoutput
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )

23
tests/auto/wayland/xdgshell/CMakeLists.txt
View File

@ -6,28 +6,7 @@
qt_internal_add_test(tst_xdgshell qt_internal_add_test(tst_xdgshell
SOURCES SOURCES
../shared/corecompositor.cpp ../shared/corecompositor.h
../shared/coreprotocol.cpp ../shared/coreprotocol.h
../shared/datadevice.cpp ../shared/datadevice.h
../shared/mockcompositor.cpp ../shared/mockcompositor.h
../shared/textinput.cpp ../shared/textinput.h
../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
../shared/xdgshell.cpp ../shared/xdgshell.h
tst_xdgshell.cpp tst_xdgshell.cpp
INCLUDE_DIRECTORIES
../shared
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui SharedClientTest
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server
Threads::Threads # special case
)
qt6_generate_wayland_protocol_server_sources(tst_xdgshell
FILES
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
) )