Use GTEST_SKIP in unsupported tests (#604)

Also includes the following changes:

* distortion_camera test: reference github issue
* [fix] dvl test: check pointer in TearDown
  The TearDown unconditionally dereferences the
  engine pointer, which segfaults if the engine failed
  to load. Check the pointer before dereferencing.

Signed-off-by: Steve Peters <scpeters@intrinsic.ai>
(cherry picked from commit fc58044)

# Conflicts:
#	test/integration/boundingbox_camera.cc
#	test/integration/camera.cc
#	test/integration/depth_camera.cc
#	test/integration/distortion_camera.cc
#	test/integration/dvl.cc
#	test/integration/gpu_lidar_sensor.cc
#	test/integration/rgbd_camera.cc
#	test/integration/segmentation_camera.cc
#	test/integration/thermal_camera.cc
#	test/integration/triggered_boundingbox_camera.cc
#	test/integration/triggered_camera.cc
#	test/integration/wide_angle_camera.cc

Author: scpeters

test/integration/boundingbox_camera.cc

@@ -216,18 +216,24 @@ void BoundingBoxCameraSensorTest::BoxesWithBuiltinSDF(
   // Skip unsupported engines
   if (_renderEngine != "ogre2")
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' doesn't support bounding box cameras" << std::endl;
-    return;
   }
 
   // Setup ign-rendering with an empty scene
   auto *engine = rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' is not supported" << std::endl;
-    return;
   }
 
   rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -385,18 +391,24 @@ void BoundingBoxCameraSensorTest::Boxes3DWithBuiltinSDF(
   // Skip unsupported engines
   if (_renderEngine != "ogre2")
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' doesn't support bounding box cameras" << std::endl;
-    return;
   }
 
   // Setup ign-rendering with an empty scene
   auto *engine = rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' is not supported" << std::endl;
-    return;
   }
 
   rendering::ScenePtr scene = engine->CreateScene("scene");

test/integration/camera.cc

@@ -118,9 +118,12 @@ void CameraSensorTest::ImagesWithBuiltinSDF(const std::string &_renderEngine)
   auto *engine = ignition::rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' is not supported" << std::endl;
-    return;
   }
 
   ignition::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -221,9 +224,12 @@ void CameraSensorTest::CameraIntrinsics(const std::string &_renderEngine)
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
           << "' is not supported" << std::endl;
-    return;
   }
 
   gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -519,9 +525,12 @@ void CameraSensorTest::CameraProjection(const std::string &_renderEngine)
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
           << "' is not supported" << std::endl;
-    return;
   }
 
   gz::rendering::ScenePtr scene = engine->CreateScene("scene");
@@ -810,9 +819,12 @@ void CameraSensorTest::ImageFormatLInt8(const std::string &_renderEngine)
   auto *engine = ignition::rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' is not supported" << std::endl;
-    return;
   }
 
   ignition::rendering::ScenePtr scene = engine->CreateScene("scene");

test/integration/depth_camera.cc

@@ -188,9 +188,12 @@ void DepthCameraSensorTest::ImagesWithBuiltinSDF(
   if ((_renderEngine.compare("ogre") != 0) &&
       (_renderEngine.compare("ogre2") != 0))
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' doesn't support depth cameras" << std::endl;
-    return;
   }
 
   // Setup ign-rendering with an empty scene

test/integration/distortion_camera.cc

@@ -80,18 +80,28 @@ void DistortionCameraSensorTest::ImagesWithBuiltinSDF(
 
   if (_renderEngine == "ogre2")
   {
+<<<<<<< HEAD
     igndbg << "Distortion camera not supported yet in rendering engine: "
             << _renderEngine << std::endl;
     return;
+=======
+    GTEST_SKIP() << "Distortion camera not supported yet in rendering engine: "
+                 << _renderEngine
+                 << ", see https://github.com/gazebosim/gz-rendering/issues/697"
+                 << std::endl;
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
   }
 
   // Setup ign-rendering with an empty scene
   auto *engine = gz::rendering::engine(_renderEngine);
   if (!engine)
   {
+<<<<<<< HEAD
     igndbg << "Engine '" << _renderEngine
+=======
+    GTEST_SKIP() << "Engine '" << _renderEngine
+>>>>>>> fc58044 (Use GTEST_SKIP in unsupported tests (#604))
               << "' is not supported" << std::endl;
-    return;
   }
 
   gz::rendering::ScenePtr scene = engine->CreateScene("scene");