common/symbols.map: Add new symbols for mir::time::PosixClock infrast…

…ructure
canonical · Jan 16, 2025 · 21ed509 · 21ed509
1 parent c8a01ab
commit 21ed509
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/src/common/symbols.map b/src/common/symbols.map
@@ -701,13 +701,16 @@ global:
 MIR_COMMON_2.19 {
 global:
   extern "C++" {
+    mir::time::clock_gettime_checked*;
+    mir::time::is_steady_specialisation::is_steady*;
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
     mir::SharedLibrary::get_handle*;
     mir::SharedLibrary::Handle::HandleHash::operator*;
     std::hash?mir::SharedLibrary::Handle?::operator*;
     typeinfo?for?mir::SharedLibrary::Handle;
     typeinfo?for?mir::SharedLibrary::Handle::HandleHash;
+    typeinfo?for?mir::time::is_steady_specialisation;
   };
 } MIR_COMMON_2.18;
 
diff --git a/tests/mir_test_framework/test_display_server.cpp b/tests/mir_test_framework/test_display_server.cpp
@@ -60,7 +60,6 @@ miral::TestDisplayServer::TestDisplayServer(int argc, char const** argv) :
     unsetenv("WAYLAND_DISPLAY");    // We don't want to conflict with any existing server
     add_to_environment("MIR_SERVER_PLATFORM_PATH", mtf::server_platform_path().c_str());
     add_to_environment("MIR_SERVER_PLATFORM_DISPLAY_LIBS", "mir:stub-graphics");
-    add_to_environment("MIR_SERVER_PLATFORM_RENDERING_LIBS", "mir:stub-graphics");
     add_to_environment("MIR_SERVER_PLATFORM_INPUT_LIB", "mir:stub-input");
     add_to_environment("MIR_SERVER_CONSOLE_PROVIDER", "none");
 }
@@ -104,24 +103,6 @@ void miral::TestDisplayServer::start_server()
                                 });
                         });
 
-
-                    server.override_the_display_buffer_compositor_factory(
-                        [&server]() -> std::shared_ptr<mir::compositor::DisplayBufferCompositorFactory>
-                        {
-                            auto first_rendering_platform = server.the_rendering_platforms().front();
-                            auto gl_provider =
-                                mg::RenderingPlatform::acquire_provider<mg::GLRenderingProvider>(
-                                    std::move(first_rendering_platform));
-                            if (gl_provider)
-                            {
-                                return std::make_shared<mtf::HeadlessDisplayBufferCompositorFactory>(
-                                    std::move(gl_provider),
-                                    server.the_gl_config());
-                            }
-                            BOOST_THROW_EXCEPTION((std::runtime_error{"Platform does not support GL interface"}));
-                        });
-
-
                     server.override_the_logger([&]()
                         {
                             std::shared_ptr<ml::Logger> result{};