From 589f6f6ca8d41b757380aba3c813e26cb72dc733 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 19:44:22 +0200 Subject: [PATCH 1/3] Fix running rendering tests in GZ_ENABLE_RELOCATABLE_INSTALL is ON (#1073) Signed-off-by: Silvio Traversaro --- test/gz_rendering_test.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/gz_rendering_test.cmake b/test/gz_rendering_test.cmake index 4868bb363..f5ffe511d 100644 --- a/test/gz_rendering_test.cmake +++ b/test/gz_rendering_test.cmake @@ -81,6 +81,11 @@ macro(gz_configure_rendering_test) APPEND PROPERTY ENVIRONMENT "GZ_ENGINE_BACKEND=${gz_configure_rendering_test_RENDER_ENGINE_BACKEND}") + set_property( + TEST ${test_name} + APPEND PROPERTY + ENVIRONMENT "GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") + if(gz_configure_rendering_test_HEADLESS) set_property( TEST ${test_name} From a7a724737a79b8fb7cf773a8d3795cda74d97057 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 19:45:16 +0200 Subject: [PATCH 2/3] Unload rendering plugin also on Windows (#1074) Signed-off-by: Silvio Traversaro --- src/RenderEngineManager.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc index 8e3a6f0f4..54ba3a591 100644 --- a/src/RenderEngineManager.cc +++ b/src/RenderEngineManager.cc @@ -563,14 +563,10 @@ bool RenderEngineManagerPrivate::UnloadEnginePlugin( std::string pluginName = it->second; this->enginePlugins.erase(it); -#ifndef _WIN32 - // Unloading the plugin on windows causes tests to crash on exit - // see issue #45 if (!this->pluginLoader.ForgetLibraryOfPlugin(pluginName)) { gzerr << "Failed to unload plugin: " << pluginName << std::endl; } -#endif std::lock_guard lock(this->enginesMutex); auto engineIt = this->engines.find(_engineName); From c130dd3db100c4b20e53862fcce0858cd498765a Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 11 Oct 2024 10:08:50 -0700 Subject: [PATCH 3/3] Fix Windows github action workflow (#1080) Signed-off-by: Ian Chen --- .github/workflows/windows.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index e3ed647a9..2dfddd0ee 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -39,10 +39,10 @@ jobs: - name: Build Dependencies run: | - pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --event-handlers console_direct+ --packages-up-to ${env:PACKAGE} + pixi run colcon build --merge-install --cmake-args " -GVisual Studio 17 2022" " -A x64" " -DCMAKE_BUILD_TYPE=Release" " -DBUILD_TESTING=OFF" --event-handlers console_direct+ --packages-up-to ${env:PACKAGE} - name: Build Package - run: pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DSKIP_ogre=ON --event-handlers console_direct+ --packages-select ${env:PACKAGE} + run: pixi run colcon build --merge-install --cmake-args " -GVisual Studio 17 2022" " -A x64" " -DCMAKE_BUILD_TYPE=Release" " -DBUILD_TESTING=ON" " -DSKIP_ogre=ON" --event-handlers console_direct+ --packages-select ${env:PACKAGE} - name: Test run: pixi run colcon test --merge-install --event-handlers console_direct+ --packages-select ${env:PACKAGE}