Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test_config.h to include real engines found (gz-rendering6) #1089

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Fix test_config.h to include real engines found (gz-rendering6) #1089

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7497397
Fix test_config.h to include real engines found
j-rivero Dec 3, 2024
a712899
Ogre and Ogre2 are not compatible. Prefer to have Ogre2.
j-rivero Dec 3, 2024
c861a44
Remove optix from Mac
j-rivero Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions test/test_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading