cherry pick f9f1820 and fix conflicts

Signed-off-by: Ian Chen <[email protected]>
gazebosim · Jun 14, 2021 · fe96179 · fe96179
1 parent b227f1e
commit fe96179
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc
@@ -469,11 +469,7 @@ void DepthCameraTest::DepthCameraBoxes(
   ignition::rendering::unloadEngine(engine->Name());
 }
 
-#ifdef __APPLE__
-TEST_P(DepthCameraTest, DISABLED_DepthCameraBoxes)
-#else
 TEST_P(DepthCameraTest, DepthCameraBoxes)
-#endif
 {
   DepthCameraBoxes(GetParam());
 }