Fix test_config.h to include real engines found (gz-rendering6) #1089
Conversation
Instead of hardcoding them by architecture, create the right list of engines from the support found by CMake. Signed-off-by: Jose Luis Rivero <[email protected]>
j-rivero
changed the title
test/test_config.h.in
Outdated
| /// \todo(anyone) re-enable ogre2 test once ogre 2.2 works on macOS | ||
| #ifdef __APPLE__ | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"}; | ||
| #else | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"}; | ||
| #if defined(HAVE_OGRE) && defined(HAVE_OPTIX) && defined(HAVE_OGRE2) | ||
| static const std::vector<const char *> kRenderEngineTestValues{"ogre", "ogre2", "optix"}; |
There was a problem hiding this comment.
I remember why we have the weird logic with hardcoded engine names. In fortress, we can't run ogre and ogre2 tests one after another due to conflicting symbols in the dynamic library. So if both ogre and ogre2 exists, we prefer running the test with ogre2. In this case it would be:
static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
Note that the tests fixture is revamped in #685 so Harmonic does not have this issue any more.
test/test_config.h.in
Outdated
| #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{"ogre", "ogre2"}; |
There was a problem hiding this comment.
see above, we can't have ogre running with ogre2, so this would be:
static const std::vector<const char *> kRenderEngineTestValues{"ogre2"};
|
I think |
Signed-off-by: Jose Luis Rivero <[email protected]>
test/test_config.h.in
Outdated
| #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"}; |
There was a problem hiding this comment.
@iche033 does it make sense to have optix in Mac?
There was a problem hiding this comment.
we never tested it on mac so I think can just remove optix here
This is failing because the parser log founds Err occurrences in the log. It is working as expected. |
Signed-off-by: Jose Luis Rivero <[email protected]>
🦟 Bug fix
Fixes #
Summary
Instead of hardcoding them by architecture, create the right list of engines from the support found by CMake.
This change will enable ogre1 tests for Windows currently disabled.
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.