From 9fdb6643dfa8577af8925bae17d79f900f3f6a11 Mon Sep 17 00:00:00 2001 From: Crola1702 Date: Thu, 1 Aug 2024 09:55:50 -0500 Subject: [PATCH 1/3] Disable unit tests for apple Signed-off-by: Crola1702 --- src/Camera_TEST.cc | 8 ++++++++ src/Capsule_TEST.cc | 4 ++++ src/Heightmap_TEST.cc | 2 +- src/JointVisual_TEST.cc | 4 ++++ src/LidarVisual_TEST.cc | 4 ++++ src/LightVisual_TEST.cc | 4 ++++ src/Mesh_TEST.cc | 8 ++++++++ src/OrthoViewController_TEST.cc | 8 ++++++++ src/RenderTarget_TEST.cc | 8 ++++++++ src/Scene_TEST.cc | 12 ++++++++++++ src/Text_TEST.cc | 4 ++++ src/Visual_TEST.cc | 16 ++++++++++++++++ src/WireBox_TEST.cc | 4 ++++ 13 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/Camera_TEST.cc b/src/Camera_TEST.cc index 284cd82c7..e68495859 100644 --- a/src/Camera_TEST.cc +++ b/src/Camera_TEST.cc @@ -355,6 +355,10 @@ void CameraTest::AddRemoveRenderPass(const std::string &_renderEngine) ///////////////////////////////////////////////// void CameraTest::VisibilityMask(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif // create and populate scene RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) @@ -388,6 +392,10 @@ void CameraTest::VisibilityMask(const std::string &_renderEngine) ///////////////////////////////////////////////// void CameraTest::IntrinsicMatrix(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif // create and populate scene RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) diff --git a/src/Capsule_TEST.cc b/src/Capsule_TEST.cc index d59fbe811..d5e9891f7 100644 --- a/src/Capsule_TEST.cc +++ b/src/Capsule_TEST.cc @@ -39,6 +39,10 @@ class CapsuleTest : public testing::Test, ///////////////////////////////////////////////// void CapsuleTest::Capsule(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine != "ogre" && _renderEngine != "ogre2") { igndbg << "Capsule not supported yet in rendering engine: " diff --git a/src/Heightmap_TEST.cc b/src/Heightmap_TEST.cc index 7a7b93f68..7b86a66b3 100644 --- a/src/Heightmap_TEST.cc +++ b/src/Heightmap_TEST.cc @@ -47,7 +47,7 @@ class HeightmapTest : public testing::Test, ///////////////////////////////////////////////// // ogre1 not supported on Windows -TEST_P(HeightmapTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Heightmap)) +TEST_P(HeightmapTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Heightmap)) { std::string renderEngine{this->GetParam()}; diff --git a/src/JointVisual_TEST.cc b/src/JointVisual_TEST.cc index 8994719a5..a0d9d35ee 100644 --- a/src/JointVisual_TEST.cc +++ b/src/JointVisual_TEST.cc @@ -40,6 +40,10 @@ class JointVisualTest : public testing::Test, ///////////////////////////////////////////////// void JointVisualTest::JointVisual(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/LidarVisual_TEST.cc b/src/LidarVisual_TEST.cc index d45491d76..fa8013a68 100644 --- a/src/LidarVisual_TEST.cc +++ b/src/LidarVisual_TEST.cc @@ -37,6 +37,10 @@ class LidarVisualTest : public testing::Test, ///////////////////////////////////////////////// void LidarVisualTest::LidarVisual(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine == "optix") { igndbg << "LidarVisual not supported yet in rendering engine: " diff --git a/src/LightVisual_TEST.cc b/src/LightVisual_TEST.cc index 13f20cb13..dbf0a2ef6 100644 --- a/src/LightVisual_TEST.cc +++ b/src/LightVisual_TEST.cc @@ -40,6 +40,10 @@ class LightVisualTest : public testing::Test, ///////////////////////////////////////////////// void LightVisualTest::LightVisual(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/Mesh_TEST.cc b/src/Mesh_TEST.cc index c907d7b40..7840974f8 100644 --- a/src/Mesh_TEST.cc +++ b/src/Mesh_TEST.cc @@ -230,6 +230,10 @@ TEST_P(MeshTest, MeshSkeleton) ///////////////////////////////////////////////// void MeshTest::MeshSkeletonAnimation(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { @@ -326,6 +330,10 @@ TEST_P(MeshTest, MeshSkeletonAnimation) ///////////////////////////////////////////////// void MeshTest::MeshClone(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/OrthoViewController_TEST.cc b/src/OrthoViewController_TEST.cc index a7b92596d..61faffd9d 100644 --- a/src/OrthoViewController_TEST.cc +++ b/src/OrthoViewController_TEST.cc @@ -42,6 +42,10 @@ class OrthoViewControllerTest : public testing::Test, ///////////////////////////////////////////////// void OrthoViewControllerTest::OrthoViewControl(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { @@ -85,6 +89,10 @@ void OrthoViewControllerTest::OrthoViewControl(const std::string &_renderEngine) ///////////////////////////////////////////////// void OrthoViewControllerTest::Control(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/RenderTarget_TEST.cc b/src/RenderTarget_TEST.cc index 8aea17798..f36bca2b9 100644 --- a/src/RenderTarget_TEST.cc +++ b/src/RenderTarget_TEST.cc @@ -85,6 +85,10 @@ void RenderTargetTest::RenderTexture(const std::string &_renderEngine) ///////////////////////////////////////////////// void RenderTargetTest::RenderWindow(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine != "ogre") { igndbg << "RenderWindow not supported yet in rendering engine: " @@ -134,6 +138,10 @@ void RenderTargetTest::RenderWindow(const std::string &_renderEngine) ///////////////////////////////////////////////// void RenderTargetTest::AddRemoveRenderPass(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine != "ogre") { igndbg << "RenderWindow not supported yet in rendering engine: " diff --git a/src/Scene_TEST.cc b/src/Scene_TEST.cc index c2dc3696a..0bea05c4b 100644 --- a/src/Scene_TEST.cc +++ b/src/Scene_TEST.cc @@ -764,6 +764,10 @@ void SceneTest::Materials(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::Time(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif auto engine = rendering::engine(_renderEngine); if (!engine) { @@ -811,6 +815,10 @@ void SceneTest::Time(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::BackgroundMaterial(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif auto engine = rendering::engine(_renderEngine); if (!engine) { @@ -838,6 +846,10 @@ void SceneTest::BackgroundMaterial(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::Sky(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif auto engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/Text_TEST.cc b/src/Text_TEST.cc index 1eafe7472..424bcc21d 100644 --- a/src/Text_TEST.cc +++ b/src/Text_TEST.cc @@ -36,6 +36,10 @@ class TextTest : public testing::Test, ///////////////////////////////////////////////// void TextTest::Text(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine != "ogre") { igndbg << "Text not supported yet in rendering engine: " diff --git a/src/Visual_TEST.cc b/src/Visual_TEST.cc index ed30c6d0d..5a6100589 100644 --- a/src/Visual_TEST.cc +++ b/src/Visual_TEST.cc @@ -505,6 +505,10 @@ TEST_P(VisualTest, Geometry) ///////////////////////////////////////////////// void VisualTest::VisibilityFlags(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { @@ -572,6 +576,10 @@ TEST_P(VisualTest, VisibilityFlags) ///////////////////////////////////////////////// void VisualTest::BoundingBox(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { @@ -613,6 +621,10 @@ TEST_P(VisualTest, BoundingBox) ///////////////////////////////////////////////// void VisualTest::Wireframe(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { @@ -642,6 +654,10 @@ TEST_P(VisualTest, Wireframe) ///////////////////////////////////////////////// void VisualTest::Clone(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif RenderEngine *engine = rendering::engine(_renderEngine); if (!engine) { diff --git a/src/WireBox_TEST.cc b/src/WireBox_TEST.cc index 5a053c14d..9a301230b 100644 --- a/src/WireBox_TEST.cc +++ b/src/WireBox_TEST.cc @@ -37,6 +37,10 @@ class WireBoxTest : public testing::Test, ///////////////////////////////////////////////// void WireBoxTest::WireBox(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine != "ogre" && _renderEngine != "ogre2") { igndbg << "WireBox not supported yet in rendering engine: " From 80facf4b03e3210619f20ce532e8ea12c123f9ed Mon Sep 17 00:00:00 2001 From: Crola1702 Date: Thu, 1 Aug 2024 12:21:28 -0500 Subject: [PATCH 2/3] Disable integration tests for apple Signed-off-by: Crola1702 --- test/integration/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 4249b2a18..da45f1000 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -16,12 +16,14 @@ set(tests ) if (APPLE) + list(REMOVE_ITEM tests gpu_rays.cc) list(REMOVE_ITEM tests camera.cc) list(REMOVE_ITEM tests depth_camera.cc) list(REMOVE_ITEM tests render_pass.cc) list(REMOVE_ITEM tests shadows.cc) list(REMOVE_ITEM tests scene.cc) list(REMOVE_ITEM tests thermal_camera.cc) + list(REMOVE_ITEM tessts lidar_visual.cc) endif() link_directories(${PROJECT_BINARY_DIR}/test) From dfb5acffe42db70082dab157f5a6d1c853d5b2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Crist=C3=B3bal=20Arroyo?= Date: Fri, 2 Aug 2024 11:55:36 -0500 Subject: [PATCH 3/3] Update test/integration/CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ian Chen Signed-off-by: Cristóbal Arroyo Signed-off-by: Crola1702 --- test/integration/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index da45f1000..18b611e9f 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -23,7 +23,7 @@ if (APPLE) list(REMOVE_ITEM tests shadows.cc) list(REMOVE_ITEM tests scene.cc) list(REMOVE_ITEM tests thermal_camera.cc) - list(REMOVE_ITEM tessts lidar_visual.cc) + list(REMOVE_ITEM tests lidar_visual.cc) endif() link_directories(${PROJECT_BINARY_DIR}/test)