diff --git a/src/ArrowVisual_TEST.cc b/src/ArrowVisual_TEST.cc index e4a2d59b9..d9870ee0b 100644 --- a/src/ArrowVisual_TEST.cc +++ b/src/ArrowVisual_TEST.cc @@ -44,6 +44,11 @@ class ArrowVisualTest : public testing::Test, ///////////////////////////////////////////////// void ArrowVisualTest::ArrowVisual(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/AxisVisual_TEST.cc b/src/AxisVisual_TEST.cc index bc4a36b38..54fbe51da 100644 --- a/src/AxisVisual_TEST.cc +++ b/src/AxisVisual_TEST.cc @@ -45,6 +45,10 @@ class AxisVisualTest : public testing::Test, ///////////////////////////////////////////////// void AxisVisualTest::AxisVisual(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/Camera_TEST.cc b/src/Camera_TEST.cc index 99d826d4b..284cd82c7 100644 --- a/src/Camera_TEST.cc +++ b/src/Camera_TEST.cc @@ -56,6 +56,10 @@ class CameraTest : public testing::Test, ///////////////////////////////////////////////// void CameraTest::ViewProjectionMatrix(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) @@ -159,6 +163,10 @@ void CameraTest::ViewProjectionMatrix(const std::string &_renderEngine) ///////////////////////////////////////////////// void CameraTest::RenderTexture(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) @@ -213,6 +221,10 @@ void CameraTest::RenderTexture(const std::string &_renderEngine) ///////////////////////////////////////////////// void CameraTest::TrackFollow(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) @@ -285,6 +297,10 @@ void CameraTest::TrackFollow(const std::string &_renderEngine) ///////////////////////////////////////////////// void CameraTest::AddRemoveRenderPass(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/Grid_TEST.cc b/src/Grid_TEST.cc index d83ff34c9..8b2fa5a2e 100644 --- a/src/Grid_TEST.cc +++ b/src/Grid_TEST.cc @@ -37,6 +37,10 @@ class GridTest : public testing::Test, ///////////////////////////////////////////////// void GridTest::Grid(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 << "Grid not supported yet in rendering engine: " diff --git a/src/Light_TEST.cc b/src/Light_TEST.cc index 275adda40..9bc8ab61c 100644 --- a/src/Light_TEST.cc +++ b/src/Light_TEST.cc @@ -39,6 +39,10 @@ class LightTest : public testing::Test, ///////////////////////////////////////////////// void LightTest::Light(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/Marker_TEST.cc b/src/Marker_TEST.cc index 36a1cc4ff..c898e35f2 100644 --- a/src/Marker_TEST.cc +++ b/src/Marker_TEST.cc @@ -41,6 +41,10 @@ class MarkerTest : public testing::Test, ///////////////////////////////////////////////// void MarkerTest::Marker(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine == "optix") { igndbg << "Marker not supported yet in rendering engine: " diff --git a/src/Material_TEST.cc b/src/Material_TEST.cc index a529b1799..e3bc142cc 100644 --- a/src/Material_TEST.cc +++ b/src/Material_TEST.cc @@ -56,6 +56,10 @@ class MaterialTest : public testing::Test, ///////////////////////////////////////////////// void MaterialTest::MaterialProperties(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) { @@ -290,6 +294,10 @@ void MaterialTest::MaterialProperties(const std::string &_renderEngine) ///////////////////////////////////////////////// void MaterialTest::Copy(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 6637fe150..c907d7b40 100644 --- a/src/Mesh_TEST.cc +++ b/src/Mesh_TEST.cc @@ -57,6 +57,10 @@ class MeshTest : public testing::Test, ///////////////////////////////////////////////// void MeshTest::MeshSubMesh(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) { @@ -123,6 +127,10 @@ void MeshTest::MeshSubMesh(const std::string &_renderEngine) ///////////////////////////////////////////////// void MeshTest::MeshSkeleton(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/MoveToHelper_TEST.cc b/src/MoveToHelper_TEST.cc index 11960476e..91cd8db67 100644 --- a/src/MoveToHelper_TEST.cc +++ b/src/MoveToHelper_TEST.cc @@ -74,6 +74,10 @@ void MoveToHelperTest::checkIsCompleted(double timeout) void MoveToHelperTest::MoveTo(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/Node_TEST.cc b/src/Node_TEST.cc index 2fa2573c2..50059d15e 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -41,6 +41,10 @@ class NodeTest : public testing::Test, ///////////////////////////////////////////////// void NodeTest::Pose(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/OrbitViewController_TEST.cc b/src/OrbitViewController_TEST.cc index 2d86e8ece..c7f3052e1 100644 --- a/src/OrbitViewController_TEST.cc +++ b/src/OrbitViewController_TEST.cc @@ -46,6 +46,10 @@ class OrbitViewControllerTest : public testing::Test, ///////////////////////////////////////////////// void OrbitViewControllerTest::OrbitViewControl(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) { @@ -91,6 +95,10 @@ void OrbitViewControllerTest::OrbitViewControl(const std::string &_renderEngine) void OrbitViewControllerTest::OrbitViewControlCameraConstructor( 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) { @@ -127,6 +135,10 @@ void OrbitViewControllerTest::OrbitViewControlCameraConstructor( ///////////////////////////////////////////////// void OrbitViewControllerTest::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/RayQuery_TEST.cc b/src/RayQuery_TEST.cc index 761047c2a..5b9539d81 100644 --- a/src/RayQuery_TEST.cc +++ b/src/RayQuery_TEST.cc @@ -40,6 +40,10 @@ class RayQueryTest : public testing::Test, ///////////////////////////////////////////////// void RayQueryTest::RayQuery(const std::string &_renderEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif if (_renderEngine == "optix") { igndbg << "RayQuery not supported yet in rendering engine: " diff --git a/src/RenderTarget_TEST.cc b/src/RenderTarget_TEST.cc index 9e3aadd1e..8aea17798 100644 --- a/src/RenderTarget_TEST.cc +++ b/src/RenderTarget_TEST.cc @@ -48,6 +48,10 @@ class RenderTargetTest : public testing::Test, ///////////////////////////////////////////////// void RenderTargetTest::RenderTexture(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/RenderingIface_TEST.cc b/src/RenderingIface_TEST.cc index 971afd4fb..ac288041d 100644 --- a/src/RenderingIface_TEST.cc +++ b/src/RenderingIface_TEST.cc @@ -48,6 +48,10 @@ unsigned int defaultEnginesForTest() ///////////////////////////////////////////////// TEST(RenderingIfaceTest, GetEngine) { +#ifdef __APPLE__ + std::cerr << "Skipping test for apple, see issue #847." << std::endl; + return; +#endif common::Console::SetVerbosity(4); unsigned int count = defaultEnginesForTest(); diff --git a/src/Scene_TEST.cc b/src/Scene_TEST.cc index 3ec781015..c2dc3696a 100644 --- a/src/Scene_TEST.cc +++ b/src/Scene_TEST.cc @@ -69,6 +69,10 @@ class SceneTest : public testing::Test, ///////////////////////////////////////////////// void SceneTest::Scene(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) @@ -135,6 +139,10 @@ void SceneTest::Scene(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::Nodes(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) { @@ -219,6 +227,10 @@ void SceneTest::Nodes(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::RemoveNodes(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) { @@ -321,6 +333,10 @@ void SceneTest::RemoveNodes(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::DestroyNodes(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) { @@ -544,6 +560,10 @@ void SceneTest::DestroyNodes(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::NodeCycle(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) { @@ -610,6 +630,10 @@ void SceneTest::NodeCycle(const std::string &_renderEngine) ///////////////////////////////////////////////// void SceneTest::Materials(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/ThermalCamera_TEST.cc b/src/ThermalCamera_TEST.cc index fdbe14dc5..df6ed8eeb 100644 --- a/src/ThermalCamera_TEST.cc +++ b/src/ThermalCamera_TEST.cc @@ -38,6 +38,10 @@ class ThermalCameraTest : public testing::Test, ///////////////////////////////////////////////// void ThermalCameraTest::ThermalCamera(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/TransformController_TEST.cc b/src/TransformController_TEST.cc index 9b71e8185..e8475708b 100644 --- a/src/TransformController_TEST.cc +++ b/src/TransformController_TEST.cc @@ -49,6 +49,10 @@ class TransformControllerTest : public testing::Test, ///////////////////////////////////////////////// void TransformControllerTest::TransformControl(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) { @@ -136,6 +140,10 @@ void TransformControllerTest::TransformControl(const std::string &_renderEngine) ///////////////////////////////////////////////// void TransformControllerTest::WorldSpace(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) { @@ -199,6 +207,10 @@ void TransformControllerTest::WorldSpace(const std::string &_renderEngine) ///////////////////////////////////////////////// void TransformControllerTest::LocalSpace(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) { @@ -313,6 +325,10 @@ void TransformControllerTest::LocalSpace(const std::string &_renderEngine) ///////////////////////////////////////////////// void TransformControllerTest::Control2d(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/Visual_TEST.cc b/src/Visual_TEST.cc index 797a6cc1c..ed30c6d0d 100644 --- a/src/Visual_TEST.cc +++ b/src/Visual_TEST.cc @@ -66,6 +66,10 @@ class VisualTest : public testing::Test, ///////////////////////////////////////////////// void VisualTest::Material(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) { @@ -151,6 +155,10 @@ TEST_P(VisualTest, Material) ///////////////////////////////////////////////// void VisualTest::Children(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) { @@ -220,6 +228,10 @@ TEST_P(VisualTest, Children) ///////////////////////////////////////////////// void VisualTest::Scale(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) { @@ -311,6 +323,10 @@ TEST_P(VisualTest, Scale) ///////////////////////////////////////////////// void VisualTest::UserData(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) { @@ -410,6 +426,10 @@ TEST_P(VisualTest, UserData) ///////////////////////////////////////////////// void VisualTest::Geometry(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/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 65f049a0c..4249b2a18 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -15,6 +15,15 @@ set(tests heightmap.cc ) +if (APPLE) + 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) +endif() + link_directories(${PROJECT_BINARY_DIR}/test) # Test symbols having the right name on linux only