Merge branch 'ign-rendering6' into jrivero/fail_test_if_no_scene

gazebosim · Dec 4, 2024 · 0bea4d6 · 0bea4d6
2 parents 5254dd4 + 46cde99
commit 0bea4d6
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/test/test_config.h.in b/test/test_config.h.in
@@ -9,16 +9,35 @@
 #define RENDER_ENGINE_VALUES ::testing::ValuesIn(\
     gz::rendering::TestValues())
 
+#include <vector>
+#include <gz/common/Util.hh>
+#include <gz/rendering/config.hh>
+
 /// \todo(anyone) re-enable ogre2 test once ogre 2.2 works on macOS
 #ifdef __APPLE__
-static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
+static const std::vector<const char *> kRenderEngineTestValues{"ogre"};
 #else
-static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
+  /// We can not mix ogre and ogre2 tests in Fortress for a single test file
+  /// prefer here ogre2 over ogre.
+  #if defined(HAVE_OGRE) && defined(HAVE_OPTIX) && defined(HAVE_OGRE2)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
+  #elif defined(HAVE_OGRE) && defined(HAVE_OPTIX)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
+  #elif defined(HAVE_OGRE) && defined(HAVE_OGRE2)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre2"};
+  #elif defined(HAVE_OGRE2) && defined(HAVE_OPTIX)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
+  #elif defined(HAVE_OGRE)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre"};
+  #elif defined(HAVE_OGRE2)
+  static const std::vector<const char *> kRenderEngineTestValues{"ogre2"};
+  #elif defined(HAVE_OPTIX)
+  static const std::vector<const char *> kRenderEngineTestValues{"optix"};
+  #else
+  #warning "Can not detect a rendering engine support: ogre | ogre2 | optix"
+  #endif
 #endif
 
-#include <vector>
-#include <gz/common/Util.hh>
-
 namespace ignition
 {
   namespace rendering