From 3edbf33acd9bbcdc8d00aac5844c859b95bec5cf Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 8 Jun 2021 20:01:57 -0700 Subject: [PATCH] cherry pick f9f1820 and fix conflicts Signed-off-by: Ian Chen --- test/integration/depth_camera.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc index 412c3aa4a..aef6284b6 100644 --- 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()); }