From 4407a3a82656142dde35cc95e0ec75eb642cb3ed Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Thu, 25 Apr 2024 14:29:21 -0400 Subject: [PATCH 01/11] feature: publishing mirtest-internal to provide access to all mock/stub files for testing --- tests/CMakeLists.txt | 31 +++++++++++++++++++++++++++ tests/mir_test_doubles/CMakeLists.txt | 13 +++++++---- tests/mirtest-internal.pc.in | 10 +++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 tests/mirtest-internal.pc.in diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e26fbd086a4..a1c1996fb05 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -132,6 +132,11 @@ add_library(mir-test-assist STATIC $ ) +add_library(mir-test-assist-internal STATIC + $ + $ +) + target_link_libraries(mir-test-assist PUBLIC miral @@ -145,12 +150,29 @@ PRIVATE ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. ) +target_link_libraries(mir-test-assist-internal +PUBLIC + mirserver + + Boost::system + ${GTEST_BOTH_LIBRARIES} +PRIVATE + ${GMOCK_MAIN_LIBRARY} + ${GMOCK_LIBRARIES} +) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/mirtest.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mirtest.pc @ONLY ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/mirtest-internal.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/mirtest-internal.pc + @ONLY +) + install(TARGETS mir-test-assist ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -163,9 +185,18 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/mir_test_framework install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/miral DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest" ) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/tests/include/mir + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest-internal" +) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/tests/include/mir_test_framework + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest-internal" +) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest-internal.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) mir_add_memcheck_test() mir_add_detect_fd_leaks_test() diff --git a/tests/mir_test_doubles/CMakeLists.txt b/tests/mir_test_doubles/CMakeLists.txt index 2943c401277..62d1519f9f5 100644 --- a/tests/mir_test_doubles/CMakeLists.txt +++ b/tests/mir_test_doubles/CMakeLists.txt @@ -9,9 +9,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ) -set( - TEST_UTILS_SRCS - +add_library(mir-protected-test-doubles OBJECT mock_input_device.cpp triggered_main_loop.cpp fake_alarm_factory.cpp @@ -31,6 +29,13 @@ set( ${PROJECT_SOURCE_DIR}/tests/include/mir/test/doubles/mock_output_surface.h ) +target_link_libraries(mir-protected-test-doubles + PUBLIC + mirplatform + mircommon + mircore +) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") check_cxx_compiler_flag("-Wno-attributes=clang::" SUPPORTS_SCOPED_W_NO_ATTRIBUTES) if (SUPPORTS_SCOPED_W_NO_ATTRIBUTE) @@ -105,7 +110,7 @@ target_link_libraries(mir-public-test-doubles add_library(mir-test-doubles-static STATIC $ - ${TEST_UTILS_SRCS} + $ ) target_include_directories( diff --git a/tests/mirtest-internal.pc.in b/tests/mirtest-internal.pc.in new file mode 100644 index 00000000000..e9a52d33262 --- /dev/null +++ b/tests/mirtest-internal.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@PKGCONFIG_LIBDIR@ +includedir=@PKGCONFIG_INCLUDEDIR@/mirtest-internal + +Name: mirtest-internal +Description: Mir test assist internal library +Version: @MIR_VERSION@ +Requires: mirtest mirserver mirserver-internal +Libs: -L${libdir} -lmir-test-assist -lmir-test-assist-internal -ldl -lboost_filesystem -lboost_system +Cflags: -I${includedir} From 2462ccd3dbfa8340d810b33c21bcfde2ceb4bd27 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 26 Apr 2024 15:43:13 -0400 Subject: [PATCH 02/11] Publish mirtest-internal-dev --- debian/control | 17 +++++++++++++++++ debian/mirtest-internal-dev.install | 3 +++ tests/CMakeLists.txt | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 debian/mirtest-internal-dev.install diff --git a/debian/control b/debian/control index bfa0834ede4..d18d80972d4 100644 --- a/debian/control +++ b/debian/control @@ -209,6 +209,23 @@ Description: Display server for Ubuntu - test development headers and library Contains header files and static library for testing of server and/or client development. +Package: mirtest-internal-dev +Section: libdevel +Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: mirtest-dev + libmirserver-dev (= ${binary:Version}), + libboost-filesystem-dev, + libboost-system-dev, + ${misc:Depends}, +Description: Display server for Ubuntu - test development headers and library + Mir is a display server running on linux systems, with a focus on efficiency, + robust operation and a well-defined driver model. + . + Contains header files and static library for testing of server and/or client + development. + Package: mir-demos Architecture: linux-any Breaks: miral-examples diff --git a/debian/mirtest-internal-dev.install b/debian/mirtest-internal-dev.install new file mode 100644 index 00000000000..ba534445301 --- /dev/null +++ b/debian/mirtest-internal-dev.install @@ -0,0 +1,3 @@ +usr/include/mirtest-internal +usr/lib/*/pkgconfig/mirtest-internal.pc +usr/lib/*/libmir-test-assist-internal.a diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a1c1996fb05..2188d6e2cf6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -176,6 +176,9 @@ configure_file( install(TARGETS mir-test-assist ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install(TARGETS mir-test-assist-internal + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/mir DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest" ) From 63c8c8ae52a55db13cad94695611729c8a0dcf94 Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Mon, 13 Jan 2025 10:14:18 +0000 Subject: [PATCH 03/11] Fix syntax --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d18d80972d4..a09f0f7ff52 100644 --- a/debian/control +++ b/debian/control @@ -214,7 +214,7 @@ Section: libdevel Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: mirtest-dev +Depends: mirtest-dev, libmirserver-dev (= ${binary:Version}), libboost-filesystem-dev, libboost-system-dev, From 1dd58e874686562508055c0afd6e384bc91c5355 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 17 Jan 2025 14:49:27 -0500 Subject: [PATCH 04/11] Expose test_wlcs_display_server in the internal headers + remove unnecessary include in the test harness --- .../wayland => include/test/miral}/test_wlcs_display_server.h | 0 tests/acceptance-tests/wayland/CMakeLists.txt | 1 - tests/acceptance-tests/wayland/miral_integration.cpp | 2 +- .../mir_test_framework/window_management_test_harness.h | 2 +- tests/mir_test_framework/CMakeLists.txt | 1 + .../test_wlcs_display_server.cpp | 3 +-- 6 files changed, 4 insertions(+), 5 deletions(-) rename {tests/acceptance-tests/wayland => include/test/miral}/test_wlcs_display_server.h (100%) rename tests/{acceptance-tests/wayland => mir_test_framework}/test_wlcs_display_server.cpp (99%) diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.h b/include/test/miral/test_wlcs_display_server.h similarity index 100% rename from tests/acceptance-tests/wayland/test_wlcs_display_server.h rename to include/test/miral/test_wlcs_display_server.h diff --git a/tests/acceptance-tests/wayland/CMakeLists.txt b/tests/acceptance-tests/wayland/CMakeLists.txt index c12b7a5e291..df639079b71 100644 --- a/tests/acceptance-tests/wayland/CMakeLists.txt +++ b/tests/acceptance-tests/wayland/CMakeLists.txt @@ -4,7 +4,6 @@ add_library( miral_wlcs_integration MODULE miral_integration.cpp - test_wlcs_display_server.cpp test_wlcs_display_server.h ) target_link_libraries( diff --git a/tests/acceptance-tests/wayland/miral_integration.cpp b/tests/acceptance-tests/wayland/miral_integration.cpp index bcfa7d26394..45a270caaf7 100644 --- a/tests/acceptance-tests/wayland/miral_integration.cpp +++ b/tests/acceptance-tests/wayland/miral_integration.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "test_wlcs_display_server.h" +#include #include namespace diff --git a/tests/include/mir_test_framework/window_management_test_harness.h b/tests/include/mir_test_framework/window_management_test_harness.h index 88a7825565f..4c46c166946 100644 --- a/tests/include/mir_test_framework/window_management_test_harness.h +++ b/tests/include/mir_test_framework/window_management_test_harness.h @@ -23,7 +23,7 @@ #include #include #include -#include "mir/test/doubles/fake_display_configuration_observer_registrar.h" +#include #include "mir_test_framework/headless_in_process_server.h" namespace mir::scene diff --git a/tests/mir_test_framework/CMakeLists.txt b/tests/mir_test_framework/CMakeLists.txt index 155619f2bfb..4d49d930a90 100644 --- a/tests/mir_test_framework/CMakeLists.txt +++ b/tests/mir_test_framework/CMakeLists.txt @@ -55,6 +55,7 @@ add_library(mir-public-test-framework OBJECT ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/open_wrapper.h test_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_server.h test_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_display_server.h + test_wlcs_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_wlcs_display_server.h ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/mmap_wrapper.h mmap_wrapper.cpp window_management_test_harness.cpp ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/window_management_test_harness.h diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp b/tests/mir_test_framework/test_wlcs_display_server.cpp similarity index 99% rename from tests/acceptance-tests/wayland/test_wlcs_display_server.cpp rename to tests/mir_test_framework/test_wlcs_display_server.cpp index 0d0aa6770b7..6b68ed175c7 100644 --- a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp +++ b/tests/mir_test_framework/test_wlcs_display_server.cpp @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#include "test_wlcs_display_server.h" - +#include #include #include From ea111a815abad3b2f2728bd456a069c796b4d6d1 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Thu, 25 Apr 2024 14:29:21 -0400 Subject: [PATCH 05/11] feature: publishing mirtest-internal to provide access to all mock/stub files for testing --- tests/CMakeLists.txt | 31 +++++++++++++++++++++++++++ tests/mir_test_doubles/CMakeLists.txt | 13 +++++++---- tests/mirtest-internal.pc.in | 10 +++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 tests/mirtest-internal.pc.in diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e26fbd086a4..a1c1996fb05 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -132,6 +132,11 @@ add_library(mir-test-assist STATIC $ ) +add_library(mir-test-assist-internal STATIC + $ + $ +) + target_link_libraries(mir-test-assist PUBLIC miral @@ -145,12 +150,29 @@ PRIVATE ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. ) +target_link_libraries(mir-test-assist-internal +PUBLIC + mirserver + + Boost::system + ${GTEST_BOTH_LIBRARIES} +PRIVATE + ${GMOCK_MAIN_LIBRARY} + ${GMOCK_LIBRARIES} +) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/mirtest.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mirtest.pc @ONLY ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/mirtest-internal.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/mirtest-internal.pc + @ONLY +) + install(TARGETS mir-test-assist ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -163,9 +185,18 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/mir_test_framework install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/miral DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest" ) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/tests/include/mir + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest-internal" +) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/tests/include/mir_test_framework + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest-internal" +) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest-internal.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) mir_add_memcheck_test() mir_add_detect_fd_leaks_test() diff --git a/tests/mir_test_doubles/CMakeLists.txt b/tests/mir_test_doubles/CMakeLists.txt index 2943c401277..62d1519f9f5 100644 --- a/tests/mir_test_doubles/CMakeLists.txt +++ b/tests/mir_test_doubles/CMakeLists.txt @@ -9,9 +9,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ) -set( - TEST_UTILS_SRCS - +add_library(mir-protected-test-doubles OBJECT mock_input_device.cpp triggered_main_loop.cpp fake_alarm_factory.cpp @@ -31,6 +29,13 @@ set( ${PROJECT_SOURCE_DIR}/tests/include/mir/test/doubles/mock_output_surface.h ) +target_link_libraries(mir-protected-test-doubles + PUBLIC + mirplatform + mircommon + mircore +) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") check_cxx_compiler_flag("-Wno-attributes=clang::" SUPPORTS_SCOPED_W_NO_ATTRIBUTES) if (SUPPORTS_SCOPED_W_NO_ATTRIBUTE) @@ -105,7 +110,7 @@ target_link_libraries(mir-public-test-doubles add_library(mir-test-doubles-static STATIC $ - ${TEST_UTILS_SRCS} + $ ) target_include_directories( diff --git a/tests/mirtest-internal.pc.in b/tests/mirtest-internal.pc.in new file mode 100644 index 00000000000..e9a52d33262 --- /dev/null +++ b/tests/mirtest-internal.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@PKGCONFIG_LIBDIR@ +includedir=@PKGCONFIG_INCLUDEDIR@/mirtest-internal + +Name: mirtest-internal +Description: Mir test assist internal library +Version: @MIR_VERSION@ +Requires: mirtest mirserver mirserver-internal +Libs: -L${libdir} -lmir-test-assist -lmir-test-assist-internal -ldl -lboost_filesystem -lboost_system +Cflags: -I${includedir} From c5e54fdda9deebf3daa97f6e0ce95dfd44a0b86f Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 26 Apr 2024 15:43:13 -0400 Subject: [PATCH 06/11] Publish mirtest-internal-dev --- debian/control | 17 +++++++++++++++++ debian/mirtest-internal-dev.install | 3 +++ tests/CMakeLists.txt | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 debian/mirtest-internal-dev.install diff --git a/debian/control b/debian/control index 5f7ef304ecb..6b2a7b653bd 100644 --- a/debian/control +++ b/debian/control @@ -209,6 +209,23 @@ Description: Display server for Ubuntu - test development headers and library Contains header files and static library for testing of server and/or client development. +Package: mirtest-internal-dev +Section: libdevel +Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: mirtest-dev + libmirserver-dev (= ${binary:Version}), + libboost-filesystem-dev, + libboost-system-dev, + ${misc:Depends}, +Description: Display server for Ubuntu - test development headers and library + Mir is a display server running on linux systems, with a focus on efficiency, + robust operation and a well-defined driver model. + . + Contains header files and static library for testing of server and/or client + development. + Package: mir-demos Architecture: linux-any Breaks: miral-examples diff --git a/debian/mirtest-internal-dev.install b/debian/mirtest-internal-dev.install new file mode 100644 index 00000000000..ba534445301 --- /dev/null +++ b/debian/mirtest-internal-dev.install @@ -0,0 +1,3 @@ +usr/include/mirtest-internal +usr/lib/*/pkgconfig/mirtest-internal.pc +usr/lib/*/libmir-test-assist-internal.a diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a1c1996fb05..2188d6e2cf6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -176,6 +176,9 @@ configure_file( install(TARGETS mir-test-assist ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install(TARGETS mir-test-assist-internal + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/test/mir DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mirtest" ) From 6125fb28282b32c8c961f046555b9c71952aaefe Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Mon, 13 Jan 2025 10:14:18 +0000 Subject: [PATCH 07/11] Fix syntax --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6b2a7b653bd..65b541cae4b 100644 --- a/debian/control +++ b/debian/control @@ -214,7 +214,7 @@ Section: libdevel Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: mirtest-dev +Depends: mirtest-dev, libmirserver-dev (= ${binary:Version}), libboost-filesystem-dev, libboost-system-dev, From f91eabe06b7a89ab767651d1606edf8237dd69ef Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 17 Jan 2025 14:49:27 -0500 Subject: [PATCH 08/11] Expose test_wlcs_display_server in the internal headers + remove unnecessary include in the test harness --- .../wayland => include/test/miral}/test_wlcs_display_server.h | 0 tests/acceptance-tests/wayland/CMakeLists.txt | 1 - tests/acceptance-tests/wayland/miral_integration.cpp | 2 +- .../mir_test_framework/window_management_test_harness.h | 2 +- tests/mir_test_framework/CMakeLists.txt | 1 + .../test_wlcs_display_server.cpp | 3 +-- 6 files changed, 4 insertions(+), 5 deletions(-) rename {tests/acceptance-tests/wayland => include/test/miral}/test_wlcs_display_server.h (100%) rename tests/{acceptance-tests/wayland => mir_test_framework}/test_wlcs_display_server.cpp (99%) diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.h b/include/test/miral/test_wlcs_display_server.h similarity index 100% rename from tests/acceptance-tests/wayland/test_wlcs_display_server.h rename to include/test/miral/test_wlcs_display_server.h diff --git a/tests/acceptance-tests/wayland/CMakeLists.txt b/tests/acceptance-tests/wayland/CMakeLists.txt index c12b7a5e291..df639079b71 100644 --- a/tests/acceptance-tests/wayland/CMakeLists.txt +++ b/tests/acceptance-tests/wayland/CMakeLists.txt @@ -4,7 +4,6 @@ add_library( miral_wlcs_integration MODULE miral_integration.cpp - test_wlcs_display_server.cpp test_wlcs_display_server.h ) target_link_libraries( diff --git a/tests/acceptance-tests/wayland/miral_integration.cpp b/tests/acceptance-tests/wayland/miral_integration.cpp index bcfa7d26394..45a270caaf7 100644 --- a/tests/acceptance-tests/wayland/miral_integration.cpp +++ b/tests/acceptance-tests/wayland/miral_integration.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "test_wlcs_display_server.h" +#include #include namespace diff --git a/tests/include/mir_test_framework/window_management_test_harness.h b/tests/include/mir_test_framework/window_management_test_harness.h index 1af2a0e0d40..c6566a01baa 100644 --- a/tests/include/mir_test_framework/window_management_test_harness.h +++ b/tests/include/mir_test_framework/window_management_test_harness.h @@ -23,7 +23,7 @@ #include #include #include -#include "mir/test/doubles/fake_display_configuration_observer_registrar.h" +#include #include "mir_test_framework/headless_in_process_server.h" namespace mir::scene diff --git a/tests/mir_test_framework/CMakeLists.txt b/tests/mir_test_framework/CMakeLists.txt index 155619f2bfb..4d49d930a90 100644 --- a/tests/mir_test_framework/CMakeLists.txt +++ b/tests/mir_test_framework/CMakeLists.txt @@ -55,6 +55,7 @@ add_library(mir-public-test-framework OBJECT ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/open_wrapper.h test_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_server.h test_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_display_server.h + test_wlcs_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_wlcs_display_server.h ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/mmap_wrapper.h mmap_wrapper.cpp window_management_test_harness.cpp ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/window_management_test_harness.h diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp b/tests/mir_test_framework/test_wlcs_display_server.cpp similarity index 99% rename from tests/acceptance-tests/wayland/test_wlcs_display_server.cpp rename to tests/mir_test_framework/test_wlcs_display_server.cpp index 0d0aa6770b7..6b68ed175c7 100644 --- a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp +++ b/tests/mir_test_framework/test_wlcs_display_server.cpp @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#include "test_wlcs_display_server.h" - +#include #include #include From 7c58462d0d8d259793ca7a25cec3f1e7f28ca8e6 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 31 Jan 2025 10:52:31 -0500 Subject: [PATCH 09/11] fedora: adding missing packages --- spread/build/fedora/task.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spread/build/fedora/task.yaml b/spread/build/fedora/task.yaml index 186e456e112..80190fbd410 100644 --- a/spread/build/fedora/task.yaml +++ b/spread/build/fedora/task.yaml @@ -46,7 +46,9 @@ execute: | yaml-cpp-devel\ egl-wayland-devel \ systemtap-sdt-devel \ - libdrm-devel + libdrm-devel \ + wlcs-devel \ + gmp-devel BUILD_DIR=$PWD/../build cmake \ From 3e90d197520429ae42d8ad102522606edb7fde3a Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 31 Jan 2025 11:03:45 -0500 Subject: [PATCH 10/11] alpine: add wlcs as dependency --- spread/build/alpine/task.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spread/build/alpine/task.yaml b/spread/build/alpine/task.yaml index 7d90bd924d1..8f9acead7f0 100644 --- a/spread/build/alpine/task.yaml +++ b/spread/build/alpine/task.yaml @@ -32,7 +32,8 @@ execute: | umockdev-dev \ wayland-dev \ yaml-cpp-dev \ - libapparmor-dev + libapparmor-dev \ + wlcs-dev BUILD_DIR=$PWD/../build cmake \ From 3f6f7011abdcf0ce01c6e9527f56ea0e5eed0940 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Fri, 31 Jan 2025 11:16:46 -0500 Subject: [PATCH 11/11] snap: include wlcs as a dependency --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d654b6ecf91..0f5f3413141 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -52,6 +52,7 @@ parts: - python3-pil - systemtap-sdt-dev - libapparmor-dev + - wlcs stage-packages: - libboost-filesystem1.83.0 - libboost-iostreams1.83.0