Skip to content

Commit

Permalink
Disable tests that have segfaults on Mac (rendering6) (#1028)
Browse files Browse the repository at this point in the history
* Disable unit tests for apple

Signed-off-by: Crola1702 <[email protected]>

* Disable integration tests for apple

Signed-off-by: Crola1702 <[email protected]>

* Update test/integration/CMakeLists.txt

Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Cristóbal Arroyo <[email protected]>
Signed-off-by: Crola1702 <[email protected]>

---------

Signed-off-by: Crola1702 <[email protected]>
Signed-off-by: Cristóbal Arroyo <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
  • Loading branch information
Crola1702 and iche033 authored Aug 5, 2024
1 parent c943da1 commit dd143fb
Show file tree
Hide file tree
Showing 14 changed files with 87 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/Camera_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/Capsule_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
2 changes: 1 addition & 1 deletion src/Heightmap_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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()};

Expand Down
4 changes: 4 additions & 0 deletions src/JointVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 4 additions & 0 deletions src/LidarVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
4 changes: 4 additions & 0 deletions src/LightVisual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions src/Mesh_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions src/OrthoViewController_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions src/RenderTarget_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down Expand Up @@ -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: "
Expand Down
12 changes: 12 additions & 0 deletions src/Scene_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 4 additions & 0 deletions src/Text_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
16 changes: 16 additions & 0 deletions src/Visual_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 4 additions & 0 deletions src/WireBox_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
2 changes: 2 additions & 0 deletions test/integration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 tests lidar_visual.cc)
endif()

link_directories(${PROJECT_BINARY_DIR}/test)
Expand Down

0 comments on commit dd143fb

Please sign in to comment.