Merge branch 'gz-rendering9' into test_ci

gazebosim · Oct 9, 2024 · 33d1889 · 33d1889
2 parents d93c7ff + a7a7247
commit 33d1889
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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<std::recursive_mutex> lock(this->enginesMutex);
   auto engineIt = this->engines.find(_engineName);

diff --git 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}