From 1014843d091103f23d114763eb15889be602c0fd Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 15 Sep 2021 16:49:18 -0700 Subject: [PATCH] Run ogre 1.x tests on macos (#156) Signed-off-by: Ian Chen --- test/test_config.h.in | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/test/test_config.h.in b/test/test_config.h.in index 50eac1b4..caf8a99a 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -10,28 +10,13 @@ ignition::rendering::TestValues()) // Configure tests based on installed render engines -#define WITH_OGRE_AND_NO_OGRE2 (WITH_OGRE && !WITH_OGRE2) -#define WITH_NO_OGRE_AND_OGRE2 (!WITH_OGRE && WITH_OGRE2) -#define WITH_OGRE_AND_OGRE2 (WITH_OGRE && WITH_OGRE2) -#define NO_OGRE_AND_NO_OGRE2 (!WITH_OGRE && !WITH_OGRE2) - -#if WITH_OGRE_AND_NO_OGRE2 -static const std::vector kRenderEngineTestValues{"ogre"}; -#endif - -#if WITH_NO_OGRE_AND_OGRE2 -static const std::vector kRenderEngineTestValues{"ogre2"}; -#endif - -// It cannot run tests with both ogre render engines at the same time -// so it will use only ogre2 by default. -#if WITH_OGRE_AND_OGRE2 +// ogre 1.x and ogre 2.x tests can not be run at the same time +// so use only ogre2 by default. +#if WITH_OGRE2 && !defined(__APPLE__) static const std::vector kRenderEngineTestValues{"ogre2"}; -#endif - -// If no render engines are installed it will try to use none, it won't -// find any and the test will pass. -#if NO_OGRE_AND_NO_OGRE2 +#elif WITH_OGRE +static const std::vector kRenderEngineTestValues{"ogre"}; +#else static const std::vector kRenderEngineTestValues{"none"}; #endif